log.dat: Added 'squid' and 'snort' plus translations

Added 'squid' and 'snort' to section dropdown in LOGS / SYSTEM LOGS,
added translations.

Added translation string for 'web proxy' in '30-network.menu'.

Signed-off-by: Matthias Fischer <matthias.fischer@ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

diff --git a/config/menu/30-network.menu b/config/menu/30-network.menu
index c50508f818b8e7b47187e6bd90e52cfda1179a89..8e1336a3b6957e0c3756bd504188b63c2cf1ec0f 100644 (file)
--- a/config/menu/30-network.menu
+++ b/config/menu/30-network.menu
@@ -3,9 +3,9 @@
                                'title' => "$Lang::tr{'net config'}",
                                'enabled' => 0,
                                };
-    $subnetwork->{'20.proxy'} = {'caption' => 'Webproxy',
+    $subnetwork->{'20.proxy'} = {'caption' => "$Lang::tr{'web proxy'}",
                                'uri' => '/cgi-bin/proxy.cgi',
-                               'title' => "Webproxy",
+                               'title' => "$Lang::tr{'web proxy'}",
                                'enabled' => 1,
                                };
     $subnetwork->{'21.urlfilter'} = {'caption' => $Lang::tr{'url filter'},

diff --git a/html/cgi-bin/logs.cgi/log.dat b/html/cgi-bin/logs.cgi/log.dat
index 9f4d714593177f3a7ce5081faae2be2081f459a7..8c3c37dcc47863b8e4019f25ac98f623cc140cb2 100644 (file)
--- a/html/cgi-bin/logs.cgi/log.dat
+++ b/html/cgi-bin/logs.cgi/log.dat
@@ -65,7 +65,9 @@ my %sections = (
         'ipsec' => '(ipsec_[\w_]+: |pluto\[.*\]: |charon: |vpnwatch: )',
         'openvpn' => '(openvpnserver\[.*\]: |.*n2n\[.*\]: )',
         'pakfire' => '(pakfire:) ',
-        'wireless' => '(hostapd:|kernel: ath.*:|kernel: wifi[0-9]:) '
+        'wireless' => '(hostapd:|kernel: ath.*:|kernel: wifi[0-9]:) ',
+        'squid' => '(squid\[.*\]: |squid: )',
+        'snort' => '(snort\[.*\]: )'
         );
 
 # Translations for the %sections array.
@@ -86,7 +88,9 @@ my %trsections = (
         'ipsec' => 'IPSec',
         'openvpn' => 'OpenVPN',
         'pakfire' => 'Pakfire',
-        'wireless' => 'Wireless'
+        'wireless' => 'Wireless',
+        'squid' => "$Lang::tr{'web proxy'}",
+        'snort' => "$Lang::tr{'intrusion detection'}"
        );