Merge remote-tracking branch 'amarx/firewall-fifteen' into fifteen

diff --git a/html/cgi-bin/firewall.cgi b/html/cgi-bin/firewall.cgi
index ffd8adfea9e0b6b40b161fc583a31c9c164beaec..5d58713ab70dd48dcd8ec764a4632e846ff55761 100755 (executable)
--- a/html/cgi-bin/firewall.cgi
+++ b/html/cgi-bin/firewall.cgi
@@ -2370,7 +2370,7 @@ sub viewtablenew
                                                <b>$Lang::tr{'fwdfw source'}</b>
                                        </th>
                                        <th align='center'>
-                                               Log <!-- XXX UNTRANSLATED STRING -->
+                                               <b>$Lang::tr{'fwdfw log'}</b>
                                        </th>
                                        <th align='center' width='30%'>
                                                <b>$Lang::tr{'fwdfw target'}</b>
@@ -2493,7 +2493,7 @@ END
                        &getcolor($$hash{$key}[3],$$hash{$key}[4],\%customhost);
                        print"<td align='center' width='30%' $tdcolor>";
                        if ($$hash{$key}[3] eq 'ipfire_src'){
-                               $ipfireiface='Interface '; # XXX UNTRANSLATED STRING
+                               $ipfireiface=$Lang::tr{'fwdfw iface'};
                        }
                        if ($$hash{$key}[3] eq 'std_net_src'){
                                print &get_name($$hash{$key}[4]);

diff --git a/langs/de/cgi-bin/de.pl b/langs/de/cgi-bin/de.pl
index ed6afcece07d7e3808a5d87d2f1528a79147a6e0..6b38be8de47ad405535773edf8af240312a53b4d 100644 (file)
--- a/langs/de/cgi-bin/de.pl
+++ b/langs/de/cgi-bin/de.pl
@@ -949,7 +949,9 @@
 'fwdfw from' => 'Von:',
 'fwdfw hint ip1' => 'Die zuletzt erzeugte Regel mag eventuell niemals zutreffen, da sich Quelle und Ziel überlappen.',
 'fwdfw hint ip2' => 'Bitte überprüfen Sie, ob diese Regel Sinn macht: ',
+'fwdfw iface' => 'Interface',
 'fwdfw ipsec network' => 'IPsec-Netzwerke:',
+'fwdfw log' => 'Log',
 'fwdfw log rule' => 'Logging aktivieren',
 'fwdfw man port' => 'Port(s):',
 'fwdfw menu' => 'Firewallregeln',

diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl
index f14eb50158503b58bfd21c36d79fce30c898e81e..af5baca49b6fe7743786ece3787af81a7e2001f1 100644 (file)
--- a/langs/en/cgi-bin/en.pl
+++ b/langs/en/cgi-bin/en.pl
@@ -974,7 +974,9 @@
 'fwdfw from' => 'From:',
 'fwdfw hint ip1' => 'The last generated rule may never match, because source and destination subnets may overlap.',
 'fwdfw hint ip2' => 'Please double-check if this rule makes sense: ',
+'fwdfw iface' => 'Interface',
 'fwdfw ipsec network' => 'IPsec networks:',
+'fwdfw log' => 'Log',
 'fwdfw log rule' => 'Log rule',
 'fwdfw man port' => 'Port(s):',
 'fwdfw menu' => 'Firewall Rules',