Merge remote-tracking branch 'stevee/next-suricata' into next

diff --cc config/etc/group
Simple merge

diff --cc config/etc/passwd
Simple merge

diff --cc config/rootfiles/common/aarch64/stage2
Simple merge

diff --cc config/rootfiles/common/stage2
Simple merge

diff --cc config/rootfiles/common/x86_64/stage2
Simple merge

diff --cc langs/de/cgi-bin/de.pl
Simple merge

diff --cc langs/en/cgi-bin/en.pl
index 7697dc2020898a23ef733669a7130f0a205ea5ea,7e84be3925181daa83135da3ee8a6685d26a6071..5998204260c17cc506438e0055c6c0756c631f4f
--- 1/langs/en/cgi-bin/en.pl
--- 2/langs/en/cgi-bin/en.pl
+++ b/langs/en/cgi-bin/en.pl
@@@ -1396,14 -1410,14 +1414,15 @@@
  'instant update' => 'Instant Update',
  'integrity' => 'Integrity:',
  'interface' => 'Interface',
 +'interface mode' => 'Interface',
  'interfaces' => 'Interfaces',
  'internet' => 'INTERNET',
- 'intrusion detection' => 'Intrusion Detection',
- 'intrusion detection system' => 'Intrusion Detection System',
- 'intrusion detection system log viewer' => 'Intrusion Detection System Log Viewer',
- 'intrusion detection system rules' => 'intrusion detection system rules',
- 'intrusion detection system2' => 'Intrusion Detection System:',
+ 'intrusion detection' => 'Intrusion Prevention',
+ 'intrusion detection system' => 'Intrusion Prevention System',
+ 'intrusion detection system log viewer' => 'Intrusion Prevention System Log Viewer',
+ 'intrusion detection system rules' => 'Ruleset',
+ 'intrusion detection system2' => 'Intrusion Prevention System',
+ 'intrusion prevention system' => 'Intrusion Prevention System',
  'invalid broadcast ip' => 'Invalid broadcast IP',
  'invalid cache size' => 'Invalid cache size.',
  'invalid characters found in pre-shared key' => 'Invalid characters found in pre-shared key.',

diff --cc lfs/configroot
Simple merge

diff --cc make.sh
Simple merge

diff --cc src/initscripts/system/firewall
Simple merge