From 2dd3aa93f443ae2d29d92e3c6256329c8fb5ff46 Mon Sep 17 00:00:00 2001 From: Michael Tremer Date: Sat, 12 Apr 2014 15:55:44 +0200 Subject: [PATCH] firewall: Change headlines for rule sections. --- doc/language_issues.de | 2 ++ doc/language_issues.en | 2 ++ doc/language_issues.es | 4 ++++ doc/language_issues.fr | 4 ++++ doc/language_issues.nl | 4 ++++ doc/language_issues.pl | 4 ++++ doc/language_issues.ru | 4 ++++ doc/language_issues.tr | 4 ++++ doc/language_missings | 8 ++++++++ html/cgi-bin/firewall.cgi | 4 ++-- langs/de/cgi-bin/de.pl | 2 ++ langs/en/cgi-bin/en.pl | 2 ++ 12 files changed, 42 insertions(+), 2 deletions(-) diff --git a/doc/language_issues.de b/doc/language_issues.de index d501b712ed..decab3f6fb 100644 --- a/doc/language_issues.de +++ b/doc/language_issues.de @@ -181,6 +181,7 @@ WARNING: translation string unused: esp keylife WARNING: translation string unused: expected WARNING: translation string unused: expertoptions WARNING: translation string unused: exportkey +WARNING: translation string unused: external access WARNING: translation string unused: external access configuration WARNING: translation string unused: external access rule added WARNING: translation string unused: external access rule changed @@ -379,6 +380,7 @@ WARNING: translation string unused: original WARNING: translation string unused: other countries WARNING: translation string unused: our donors WARNING: translation string unused: out +WARNING: translation string unused: outgoing firewall WARNING: translation string unused: outgoing firewall add ip group WARNING: translation string unused: outgoing firewall add mac group WARNING: translation string unused: outgoing firewall edit ip group diff --git a/doc/language_issues.en b/doc/language_issues.en index 494780f254..c7b3c4b780 100644 --- a/doc/language_issues.en +++ b/doc/language_issues.en @@ -203,6 +203,7 @@ WARNING: translation string unused: esp keylife WARNING: translation string unused: expected WARNING: translation string unused: expertoptions WARNING: translation string unused: exportkey +WARNING: translation string unused: external access WARNING: translation string unused: external access configuration WARNING: translation string unused: external access rule added WARNING: translation string unused: external access rule changed @@ -405,6 +406,7 @@ WARNING: translation string unused: original WARNING: translation string unused: other countries WARNING: translation string unused: our donors WARNING: translation string unused: out +WARNING: translation string unused: outgoing firewall WARNING: translation string unused: outgoing firewall add ip group WARNING: translation string unused: outgoing firewall add mac group WARNING: translation string unused: outgoing firewall edit ip group diff --git a/doc/language_issues.es b/doc/language_issues.es index 0e73b2e152..187d68c768 100644 --- a/doc/language_issues.es +++ b/doc/language_issues.es @@ -196,6 +196,7 @@ WARNING: translation string unused: esp keylife WARNING: translation string unused: expected WARNING: translation string unused: expertoptions WARNING: translation string unused: exportkey +WARNING: translation string unused: external access WARNING: translation string unused: external access configuration WARNING: translation string unused: external access rule added WARNING: translation string unused: external access rule changed @@ -361,6 +362,7 @@ WARNING: translation string unused: or WARNING: translation string unused: original WARNING: translation string unused: other countries WARNING: translation string unused: out +WARNING: translation string unused: outgoing firewall WARNING: translation string unused: outgoing firewall mode0 WARNING: translation string unused: outgoing firewall mode1 WARNING: translation string unused: outgoing firewall mode2 @@ -820,6 +822,7 @@ WARNING: untranslated string: fwhost used WARNING: untranslated string: fwhost welcome WARNING: untranslated string: grouptype WARNING: untranslated string: hardware support +WARNING: untranslated string: incoming firewall access WARNING: untranslated string: integrity WARNING: untranslated string: invalid input for dpd delay WARNING: untranslated string: invalid input for dpd timeout @@ -845,6 +848,7 @@ WARNING: untranslated string: openvpn prefix openvpn subnet WARNING: untranslated string: openvpn prefix remote subnet WARNING: untranslated string: openvpn subnet is used WARNING: untranslated string: other +WARNING: untranslated string: outgoing firewall access WARNING: untranslated string: outgoing firewall p2p allow WARNING: untranslated string: outgoing firewall p2p deny WARNING: untranslated string: ovpn errmsg green already pushed diff --git a/doc/language_issues.fr b/doc/language_issues.fr index 8206c57878..ac595b0a11 100644 --- a/doc/language_issues.fr +++ b/doc/language_issues.fr @@ -196,6 +196,7 @@ WARNING: translation string unused: esp keylife WARNING: translation string unused: expected WARNING: translation string unused: expertoptions WARNING: translation string unused: exportkey +WARNING: translation string unused: external access WARNING: translation string unused: external access configuration WARNING: translation string unused: external access rule added WARNING: translation string unused: external access rule changed @@ -361,6 +362,7 @@ WARNING: translation string unused: or WARNING: translation string unused: original WARNING: translation string unused: other countries WARNING: translation string unused: out +WARNING: translation string unused: outgoing firewall WARNING: translation string unused: outgoing firewall add ip group WARNING: translation string unused: outgoing firewall add mac group WARNING: translation string unused: outgoing firewall edit ip group @@ -831,6 +833,7 @@ WARNING: untranslated string: fwhost used WARNING: untranslated string: fwhost welcome WARNING: untranslated string: grouptype WARNING: untranslated string: hardware support +WARNING: untranslated string: incoming firewall access WARNING: untranslated string: integrity WARNING: untranslated string: invalid input for dpd delay WARNING: untranslated string: invalid input for dpd timeout @@ -858,6 +861,7 @@ WARNING: untranslated string: openvpn prefix openvpn subnet WARNING: untranslated string: openvpn prefix remote subnet WARNING: untranslated string: openvpn subnet is used WARNING: untranslated string: other +WARNING: untranslated string: outgoing firewall access WARNING: untranslated string: ovpn mgmt in root range WARNING: untranslated string: ovpn mtu-disc WARNING: untranslated string: ovpn mtu-disc and mtu not 1500 diff --git a/doc/language_issues.nl b/doc/language_issues.nl index f6311e97eb..d31d972c32 100644 --- a/doc/language_issues.nl +++ b/doc/language_issues.nl @@ -198,6 +198,7 @@ WARNING: translation string unused: esp keylife WARNING: translation string unused: expected WARNING: translation string unused: expertoptions WARNING: translation string unused: exportkey +WARNING: translation string unused: external access WARNING: translation string unused: external access configuration WARNING: translation string unused: external access rule added WARNING: translation string unused: external access rule changed @@ -366,6 +367,7 @@ WARNING: translation string unused: original WARNING: translation string unused: other countries WARNING: translation string unused: our donors WARNING: translation string unused: out +WARNING: translation string unused: outgoing firewall WARNING: translation string unused: outgoing firewall add ip group WARNING: translation string unused: outgoing firewall add mac group WARNING: translation string unused: outgoing firewall edit ip group @@ -778,6 +780,7 @@ WARNING: untranslated string: fwhost used WARNING: untranslated string: fwhost welcome WARNING: untranslated string: grouptype WARNING: untranslated string: hardware support +WARNING: untranslated string: incoming firewall access WARNING: untranslated string: integrity WARNING: untranslated string: invalid input for dpd delay WARNING: untranslated string: invalid input for dpd timeout @@ -793,6 +796,7 @@ WARNING: untranslated string: most preferred WARNING: untranslated string: no hardware random number generator WARNING: untranslated string: notice WARNING: untranslated string: openvpn network +WARNING: untranslated string: outgoing firewall access WARNING: untranslated string: ovpn mgmt in root range WARNING: untranslated string: ovpn no connections WARNING: untranslated string: ovpn port in root range diff --git a/doc/language_issues.pl b/doc/language_issues.pl index 0e73b2e152..187d68c768 100644 --- a/doc/language_issues.pl +++ b/doc/language_issues.pl @@ -196,6 +196,7 @@ WARNING: translation string unused: esp keylife WARNING: translation string unused: expected WARNING: translation string unused: expertoptions WARNING: translation string unused: exportkey +WARNING: translation string unused: external access WARNING: translation string unused: external access configuration WARNING: translation string unused: external access rule added WARNING: translation string unused: external access rule changed @@ -361,6 +362,7 @@ WARNING: translation string unused: or WARNING: translation string unused: original WARNING: translation string unused: other countries WARNING: translation string unused: out +WARNING: translation string unused: outgoing firewall WARNING: translation string unused: outgoing firewall mode0 WARNING: translation string unused: outgoing firewall mode1 WARNING: translation string unused: outgoing firewall mode2 @@ -820,6 +822,7 @@ WARNING: untranslated string: fwhost used WARNING: untranslated string: fwhost welcome WARNING: untranslated string: grouptype WARNING: untranslated string: hardware support +WARNING: untranslated string: incoming firewall access WARNING: untranslated string: integrity WARNING: untranslated string: invalid input for dpd delay WARNING: untranslated string: invalid input for dpd timeout @@ -845,6 +848,7 @@ WARNING: untranslated string: openvpn prefix openvpn subnet WARNING: untranslated string: openvpn prefix remote subnet WARNING: untranslated string: openvpn subnet is used WARNING: untranslated string: other +WARNING: untranslated string: outgoing firewall access WARNING: untranslated string: outgoing firewall p2p allow WARNING: untranslated string: outgoing firewall p2p deny WARNING: untranslated string: ovpn errmsg green already pushed diff --git a/doc/language_issues.ru b/doc/language_issues.ru index e385fd8cec..8540edebac 100644 --- a/doc/language_issues.ru +++ b/doc/language_issues.ru @@ -195,6 +195,7 @@ WARNING: translation string unused: esp keylife WARNING: translation string unused: expected WARNING: translation string unused: expertoptions WARNING: translation string unused: exportkey +WARNING: translation string unused: external access WARNING: translation string unused: external access configuration WARNING: translation string unused: external access rule added WARNING: translation string unused: external access rule changed @@ -355,6 +356,7 @@ WARNING: translation string unused: or WARNING: translation string unused: original WARNING: translation string unused: other countries WARNING: translation string unused: out +WARNING: translation string unused: outgoing firewall WARNING: translation string unused: outgoing firewall add ip group WARNING: translation string unused: outgoing firewall add mac group WARNING: translation string unused: outgoing firewall edit ip group @@ -815,6 +817,7 @@ WARNING: untranslated string: fwhost used WARNING: untranslated string: fwhost welcome WARNING: untranslated string: grouptype WARNING: untranslated string: hardware support +WARNING: untranslated string: incoming firewall access WARNING: untranslated string: incoming traffic in bytes per second WARNING: untranslated string: integrity WARNING: untranslated string: invalid input for dpd delay @@ -841,6 +844,7 @@ WARNING: untranslated string: openvpn prefix openvpn subnet WARNING: untranslated string: openvpn prefix remote subnet WARNING: untranslated string: openvpn subnet is used WARNING: untranslated string: other +WARNING: untranslated string: outgoing firewall access WARNING: untranslated string: outgoing traffic in bytes per second WARNING: untranslated string: ovpn mgmt in root range WARNING: untranslated string: ovpn mtu-disc diff --git a/doc/language_issues.tr b/doc/language_issues.tr index a880a58d06..216dc8521c 100644 --- a/doc/language_issues.tr +++ b/doc/language_issues.tr @@ -203,6 +203,7 @@ WARNING: translation string unused: esp keylife WARNING: translation string unused: expected WARNING: translation string unused: expertoptions WARNING: translation string unused: exportkey +WARNING: translation string unused: external access WARNING: translation string unused: external access configuration WARNING: translation string unused: external access rule added WARNING: translation string unused: external access rule changed @@ -405,6 +406,7 @@ WARNING: translation string unused: original WARNING: translation string unused: other countries WARNING: translation string unused: our donors WARNING: translation string unused: out +WARNING: translation string unused: outgoing firewall WARNING: translation string unused: outgoing firewall add ip group WARNING: translation string unused: outgoing firewall add mac group WARNING: translation string unused: outgoing firewall edit ip group @@ -646,6 +648,8 @@ WARNING: untranslated string: bytes WARNING: untranslated string: count WARNING: untranslated string: fwdfw many WARNING: untranslated string: fwhost err hostip +WARNING: untranslated string: incoming firewall access +WARNING: untranslated string: outgoing firewall access WARNING: untranslated string: route config changed WARNING: untranslated string: routing config added WARNING: untranslated string: routing config changed diff --git a/doc/language_missings b/doc/language_missings index fc3089007b..3f1f997ddf 100644 --- a/doc/language_missings +++ b/doc/language_missings @@ -295,6 +295,7 @@ < fw settings ruletable < grouptype < hardware support +< incoming firewall access < integrity < invalid input for dpd delay < invalid input for dpd timeout @@ -328,6 +329,7 @@ < openvpn subnet is used < other < our donors +< outgoing firewall access < ovpn mgmt in root range < ovpn mtu-disc < ovpn mtu-disc and mtu not 1500 @@ -761,6 +763,7 @@ < fw settings ruletable < grouptype < hardware support +< incoming firewall access < integrity < invalid input for dpd delay < invalid input for dpd timeout @@ -792,6 +795,7 @@ < openvpn subnet is used < other < our donors +< outgoing firewall access < outgoing firewall add ip group < outgoing firewall add mac group < outgoing firewall edit ip group @@ -1211,6 +1215,7 @@ < fw settings ruletable < grouptype < hardware support +< incoming firewall access < integrity < invalid input for dpd delay < invalid input for dpd timeout @@ -1242,6 +1247,7 @@ < openvpn subnet is used < other < our donors +< outgoing firewall access < ovpn errmsg green already pushed < ovpn errmsg invalid ip or mask < ovpn mgmt in root range @@ -1651,6 +1657,7 @@ < grouptype < hardware support < hour-graph +< incoming firewall access < incoming traffic in bytes per second < integrity < invalid input for dpd delay @@ -1684,6 +1691,7 @@ < openvpn subnet is used < other < our donors +< outgoing firewall access < outgoing traffic in bytes per second < ovpn mgmt in root range < ovpn mtu-disc diff --git a/html/cgi-bin/firewall.cgi b/html/cgi-bin/firewall.cgi index 021255fd76..4dea2e94bd 100644 --- a/html/cgi-bin/firewall.cgi +++ b/html/cgi-bin/firewall.cgi @@ -2299,8 +2299,8 @@ sub viewtablerule &General::readhash("/var/ipfire/ethernet/settings", \%netsettings); &viewtablenew(\%configfwdfw, $configfwdfw, $Lang::tr{'firewall rules'}); - &viewtablenew(\%configinputfw, $configinput, $Lang::tr{'external access'}); - &viewtablenew(\%configoutgoingfw, $configoutgoing, $Lang::tr{'outgoing firewall'}); + &viewtablenew(\%configinputfw, $configinput, $Lang::tr{'incoming firewall access'}); + &viewtablenew(\%configoutgoingfw, $configoutgoing, $Lang::tr{'outgoing firewall access'}); } sub viewtablenew { diff --git a/langs/de/cgi-bin/de.pl b/langs/de/cgi-bin/de.pl index 5e8892d767..ac95fe8ecd 100644 --- a/langs/de/cgi-bin/de.pl +++ b/langs/de/cgi-bin/de.pl @@ -1200,6 +1200,7 @@ 'inactive' => 'inaktiv', 'include logfiles' => 'mit Logdateien', 'incoming' => 'eingehend', +'incoming firewall access' => 'Eingehender Firewallzugang', 'incoming traffic in bytes per second' => 'Eingehender Verkehr', 'incorrect password' => 'Fehlerhaftes Passwort', 'info' => 'Info', @@ -1599,6 +1600,7 @@ 'out' => 'Aus', 'outgoing' => 'ausgehend', 'outgoing firewall' => 'Ausgehende Firewall', +'outgoing firewall access' => 'Ausgehender Firewallzugang', 'outgoing firewall add ip group' => 'IP Adressgruppen hinzufügen', 'outgoing firewall add mac group' => 'MAC Adressgruppen hinzufügen', 'outgoing firewall edit ip group' => 'IP Adressgruppen bearbeiten', diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl index db31a89ea2..f8cdf7630c 100644 --- a/langs/en/cgi-bin/en.pl +++ b/langs/en/cgi-bin/en.pl @@ -1228,6 +1228,7 @@ 'inactive' => 'inactive', 'include logfiles' => 'Include logfiles', 'incoming' => 'incoming', +'incoming firewall access' => 'Incoming Firewall Access', 'incoming traffic in bytes per second' => 'Incoming Traffic', 'incorrect password' => 'Incorrect password', 'info' => 'Info', @@ -1629,6 +1630,7 @@ 'out' => 'Out', 'outgoing' => 'outgoing', 'outgoing firewall' => 'Outgoing Firewall', +'outgoing firewall access' => 'Outgoing Firewall Access', 'outgoing firewall add ip group' => 'Add IP Address Group', 'outgoing firewall add mac group' => 'Add MAC Address Group', 'outgoing firewall edit ip group' => 'Edit IP Address Group', -- 2.39.2