From: Michael Tremer <michael.tremer@ipfire.org>
Date: Thu, 14 Mar 2019 13:19:35 +0000 (+0000)
Subject: Merge remote-tracking branch 'stevee/next-suricata' into next
X-Git-Url: http://git.ipfire.org/?p=people%2Fpmueller%2Fipfire-2.x.git;a=commitdiff_plain;h=01604708c386da93713cffadb3d5d40665f62ec9

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

01604708c386da93713cffadb3d5d40665f62ec9
diff --cc langs/en/cgi-bin/en.pl
index 7697dc2020,7e84be3925..5998204260
--- a/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.',