From 8777989d464a11f6f538ec22c2463d0c9c18c7ad Mon Sep 17 00:00:00 2001 From: Alexander Marx Date: Thu, 17 Oct 2013 12:10:34 +0200 Subject: [PATCH] Firewall: some languagefile changes --- doc/language_issues.de | 8 +------- doc/language_issues.en | 8 +------- doc/language_issues.es | 5 +++-- doc/language_issues.fr | 5 +++-- doc/language_issues.nl | 5 +++-- doc/language_issues.pl | 5 +++-- doc/language_issues.ru | 5 +++-- doc/language_issues.tr | 5 +++-- doc/language_missings | 44 ++++++++++++------------------------------ langs/de/cgi-bin/de.pl | 10 +--------- langs/en/cgi-bin/en.pl | 10 +--------- 11 files changed, 34 insertions(+), 76 deletions(-) diff --git a/doc/language_issues.de b/doc/language_issues.de index 514a2e96a..668a98421 100644 --- a/doc/language_issues.de +++ b/doc/language_issues.de @@ -191,16 +191,10 @@ WARNING: translation string unused: fwdfw DROP WARNING: translation string unused: fwdfw MODE1 WARNING: translation string unused: fwdfw MODE2 WARNING: translation string unused: fwdfw REJECT -WARNING: translation string unused: fwdfw addr grp -WARNING: translation string unused: fwdfw cust addr -WARNING: translation string unused: fwdfw cust net -WARNING: translation string unused: fwdfw err srcovpn -WARNING: translation string unused: fwdfw err srcport WARNING: translation string unused: fwdfw err tgt_port -WARNING: translation string unused: fwdfw err tgtovpn -WARNING: translation string unused: fwdfw err tgtport WARNING: translation string unused: fwdfw from WARNING: translation string unused: fwdfw ipsec network +WARNING: translation string unused: fwdfw man port WARNING: translation string unused: fwdfw natport used WARNING: translation string unused: fwdfw rules WARNING: translation string unused: fwdfw std network diff --git a/doc/language_issues.en b/doc/language_issues.en index ef246b418..694e68da8 100644 --- a/doc/language_issues.en +++ b/doc/language_issues.en @@ -214,16 +214,10 @@ WARNING: translation string unused: fwdfw DROP WARNING: translation string unused: fwdfw MODE1 WARNING: translation string unused: fwdfw MODE2 WARNING: translation string unused: fwdfw REJECT -WARNING: translation string unused: fwdfw addr grp -WARNING: translation string unused: fwdfw cust addr -WARNING: translation string unused: fwdfw cust net -WARNING: translation string unused: fwdfw err srcovpn -WARNING: translation string unused: fwdfw err srcport WARNING: translation string unused: fwdfw err tgt_port -WARNING: translation string unused: fwdfw err tgtovpn -WARNING: translation string unused: fwdfw err tgtport WARNING: translation string unused: fwdfw from WARNING: translation string unused: fwdfw ipsec network +WARNING: translation string unused: fwdfw man port WARNING: translation string unused: fwdfw natport used WARNING: translation string unused: fwdfw rules WARNING: translation string unused: fwdfw std network diff --git a/doc/language_issues.es b/doc/language_issues.es index 7bf38299f..a739261ce 100644 --- a/doc/language_issues.es +++ b/doc/language_issues.es @@ -633,6 +633,7 @@ WARNING: untranslated string: fw settings ruletable WARNING: untranslated string: fwdfw action WARNING: untranslated string: fwdfw additional WARNING: untranslated string: fwdfw addrule +WARNING: untranslated string: fwdfw all icmp WARNING: untranslated string: fwdfw change WARNING: untranslated string: fwdfw copy WARNING: untranslated string: fwdfw delete @@ -644,7 +645,8 @@ WARNING: untranslated string: fwdfw err nosrc WARNING: untranslated string: fwdfw err nosrcip WARNING: untranslated string: fwdfw err notgt WARNING: untranslated string: fwdfw err notgtip -WARNING: untranslated string: fwdfw err prot +WARNING: untranslated string: fwdfw err prot_port +WARNING: untranslated string: fwdfw err prot_port1 WARNING: untranslated string: fwdfw err remark WARNING: untranslated string: fwdfw err ruleexists WARNING: untranslated string: fwdfw err same @@ -658,7 +660,6 @@ WARNING: untranslated string: fwdfw final_rule WARNING: untranslated string: fwdfw hint ip1 WARNING: untranslated string: fwdfw hint ip2 WARNING: untranslated string: fwdfw log rule -WARNING: untranslated string: fwdfw man port WARNING: untranslated string: fwdfw menu WARNING: untranslated string: fwdfw movedown WARNING: untranslated string: fwdfw moveup diff --git a/doc/language_issues.fr b/doc/language_issues.fr index 70f8ecf54..9ed5eb0e2 100644 --- a/doc/language_issues.fr +++ b/doc/language_issues.fr @@ -636,6 +636,7 @@ WARNING: untranslated string: fw settings ruletable WARNING: untranslated string: fwdfw action WARNING: untranslated string: fwdfw additional WARNING: untranslated string: fwdfw addrule +WARNING: untranslated string: fwdfw all icmp WARNING: untranslated string: fwdfw change WARNING: untranslated string: fwdfw copy WARNING: untranslated string: fwdfw delete @@ -647,7 +648,8 @@ WARNING: untranslated string: fwdfw err nosrc WARNING: untranslated string: fwdfw err nosrcip WARNING: untranslated string: fwdfw err notgt WARNING: untranslated string: fwdfw err notgtip -WARNING: untranslated string: fwdfw err prot +WARNING: untranslated string: fwdfw err prot_port +WARNING: untranslated string: fwdfw err prot_port1 WARNING: untranslated string: fwdfw err remark WARNING: untranslated string: fwdfw err ruleexists WARNING: untranslated string: fwdfw err same @@ -661,7 +663,6 @@ WARNING: untranslated string: fwdfw final_rule WARNING: untranslated string: fwdfw hint ip1 WARNING: untranslated string: fwdfw hint ip2 WARNING: untranslated string: fwdfw log rule -WARNING: untranslated string: fwdfw man port WARNING: untranslated string: fwdfw menu WARNING: untranslated string: fwdfw movedown WARNING: untranslated string: fwdfw moveup diff --git a/doc/language_issues.nl b/doc/language_issues.nl index c27610fb0..fc82c9d74 100644 --- a/doc/language_issues.nl +++ b/doc/language_issues.nl @@ -582,6 +582,7 @@ WARNING: untranslated string: fw settings ruletable WARNING: untranslated string: fwdfw action WARNING: untranslated string: fwdfw additional WARNING: untranslated string: fwdfw addrule +WARNING: untranslated string: fwdfw all icmp WARNING: untranslated string: fwdfw change WARNING: untranslated string: fwdfw copy WARNING: untranslated string: fwdfw delete @@ -593,7 +594,8 @@ WARNING: untranslated string: fwdfw err nosrc WARNING: untranslated string: fwdfw err nosrcip WARNING: untranslated string: fwdfw err notgt WARNING: untranslated string: fwdfw err notgtip -WARNING: untranslated string: fwdfw err prot +WARNING: untranslated string: fwdfw err prot_port +WARNING: untranslated string: fwdfw err prot_port1 WARNING: untranslated string: fwdfw err remark WARNING: untranslated string: fwdfw err ruleexists WARNING: untranslated string: fwdfw err same @@ -607,7 +609,6 @@ WARNING: untranslated string: fwdfw final_rule WARNING: untranslated string: fwdfw hint ip1 WARNING: untranslated string: fwdfw hint ip2 WARNING: untranslated string: fwdfw log rule -WARNING: untranslated string: fwdfw man port WARNING: untranslated string: fwdfw menu WARNING: untranslated string: fwdfw movedown WARNING: untranslated string: fwdfw moveup diff --git a/doc/language_issues.pl b/doc/language_issues.pl index 7bf38299f..a739261ce 100644 --- a/doc/language_issues.pl +++ b/doc/language_issues.pl @@ -633,6 +633,7 @@ WARNING: untranslated string: fw settings ruletable WARNING: untranslated string: fwdfw action WARNING: untranslated string: fwdfw additional WARNING: untranslated string: fwdfw addrule +WARNING: untranslated string: fwdfw all icmp WARNING: untranslated string: fwdfw change WARNING: untranslated string: fwdfw copy WARNING: untranslated string: fwdfw delete @@ -644,7 +645,8 @@ WARNING: untranslated string: fwdfw err nosrc WARNING: untranslated string: fwdfw err nosrcip WARNING: untranslated string: fwdfw err notgt WARNING: untranslated string: fwdfw err notgtip -WARNING: untranslated string: fwdfw err prot +WARNING: untranslated string: fwdfw err prot_port +WARNING: untranslated string: fwdfw err prot_port1 WARNING: untranslated string: fwdfw err remark WARNING: untranslated string: fwdfw err ruleexists WARNING: untranslated string: fwdfw err same @@ -658,7 +660,6 @@ WARNING: untranslated string: fwdfw final_rule WARNING: untranslated string: fwdfw hint ip1 WARNING: untranslated string: fwdfw hint ip2 WARNING: untranslated string: fwdfw log rule -WARNING: untranslated string: fwdfw man port WARNING: untranslated string: fwdfw menu WARNING: untranslated string: fwdfw movedown WARNING: untranslated string: fwdfw moveup diff --git a/doc/language_issues.ru b/doc/language_issues.ru index 35cba16dc..59ba04430 100644 --- a/doc/language_issues.ru +++ b/doc/language_issues.ru @@ -619,6 +619,7 @@ WARNING: untranslated string: fw settings ruletable WARNING: untranslated string: fwdfw action WARNING: untranslated string: fwdfw additional WARNING: untranslated string: fwdfw addrule +WARNING: untranslated string: fwdfw all icmp WARNING: untranslated string: fwdfw change WARNING: untranslated string: fwdfw copy WARNING: untranslated string: fwdfw delete @@ -630,7 +631,8 @@ WARNING: untranslated string: fwdfw err nosrc WARNING: untranslated string: fwdfw err nosrcip WARNING: untranslated string: fwdfw err notgt WARNING: untranslated string: fwdfw err notgtip -WARNING: untranslated string: fwdfw err prot +WARNING: untranslated string: fwdfw err prot_port +WARNING: untranslated string: fwdfw err prot_port1 WARNING: untranslated string: fwdfw err remark WARNING: untranslated string: fwdfw err ruleexists WARNING: untranslated string: fwdfw err same @@ -644,7 +646,6 @@ WARNING: untranslated string: fwdfw final_rule WARNING: untranslated string: fwdfw hint ip1 WARNING: untranslated string: fwdfw hint ip2 WARNING: untranslated string: fwdfw log rule -WARNING: untranslated string: fwdfw man port WARNING: untranslated string: fwdfw menu WARNING: untranslated string: fwdfw movedown WARNING: untranslated string: fwdfw moveup diff --git a/doc/language_issues.tr b/doc/language_issues.tr index f293e6ec0..179d4bb2b 100644 --- a/doc/language_issues.tr +++ b/doc/language_issues.tr @@ -579,6 +579,7 @@ WARNING: untranslated string: fw settings ruletable WARNING: untranslated string: fwdfw action WARNING: untranslated string: fwdfw additional WARNING: untranslated string: fwdfw addrule +WARNING: untranslated string: fwdfw all icmp WARNING: untranslated string: fwdfw change WARNING: untranslated string: fwdfw copy WARNING: untranslated string: fwdfw delete @@ -590,7 +591,8 @@ WARNING: untranslated string: fwdfw err nosrc WARNING: untranslated string: fwdfw err nosrcip WARNING: untranslated string: fwdfw err notgt WARNING: untranslated string: fwdfw err notgtip -WARNING: untranslated string: fwdfw err prot +WARNING: untranslated string: fwdfw err prot_port +WARNING: untranslated string: fwdfw err prot_port1 WARNING: untranslated string: fwdfw err remark WARNING: untranslated string: fwdfw err ruleexists WARNING: untranslated string: fwdfw err same @@ -604,7 +606,6 @@ WARNING: untranslated string: fwdfw final_rule WARNING: untranslated string: fwdfw hint ip1 WARNING: untranslated string: fwdfw hint ip2 WARNING: untranslated string: fwdfw log rule -WARNING: untranslated string: fwdfw man port WARNING: untranslated string: fwdfw menu WARNING: untranslated string: fwdfw movedown WARNING: untranslated string: fwdfw moveup diff --git a/doc/language_missings b/doc/language_missings index 2dfa5c75e..c14623f16 100644 --- a/doc/language_missings +++ b/doc/language_missings @@ -95,12 +95,10 @@ < fwdfw ACCEPT < fwdfw action < fwdfw additional -< fwdfw addr grp < fwdfw addrule +< fwdfw all icmp < fwdfw change < fwdfw copy -< fwdfw cust addr -< fwdfw cust net < fwdfw delete < fwdfw dnat < fwdfw dnat error @@ -111,19 +109,16 @@ < fwdfw err nosrcip < fwdfw err notgt < fwdfw err notgtip -< fwdfw err prot +< fwdfw err prot_port +< fwdfw err prot_port1 < fwdfw err remark < fwdfw err ruleexists < fwdfw err same < fwdfw err samesub < fwdfw err src_addr -< fwdfw err srcovpn -< fwdfw err srcport < fwdfw err tgt_addr < fwdfw err tgt_grp < fwdfw err tgt_mac -< fwdfw err tgtovpn -< fwdfw err tgtport < fwdfw err tgt_port < fwdfw err time < fwdfw final_rule @@ -498,12 +493,10 @@ < fwdfw ACCEPT < fwdfw action < fwdfw additional -< fwdfw addr grp < fwdfw addrule +< fwdfw all icmp < fwdfw change < fwdfw copy -< fwdfw cust addr -< fwdfw cust net < fwdfw delete < fwdfw dnat < fwdfw dnat error @@ -514,19 +507,16 @@ < fwdfw err nosrcip < fwdfw err notgt < fwdfw err notgtip -< fwdfw err prot +< fwdfw err prot_port +< fwdfw err prot_port1 < fwdfw err remark < fwdfw err ruleexists < fwdfw err same < fwdfw err samesub < fwdfw err src_addr -< fwdfw err srcovpn -< fwdfw err srcport < fwdfw err tgt_addr < fwdfw err tgt_grp < fwdfw err tgt_mac -< fwdfw err tgtovpn -< fwdfw err tgtport < fwdfw err tgt_port < fwdfw err time < fwdfw final_rule @@ -885,12 +875,10 @@ < fwdfw ACCEPT < fwdfw action < fwdfw additional -< fwdfw addr grp < fwdfw addrule +< fwdfw all icmp < fwdfw change < fwdfw copy -< fwdfw cust addr -< fwdfw cust net < fwdfw delete < fwdfw dnat < fwdfw dnat error @@ -901,19 +889,16 @@ < fwdfw err nosrcip < fwdfw err notgt < fwdfw err notgtip -< fwdfw err prot +< fwdfw err prot_port +< fwdfw err prot_port1 < fwdfw err remark < fwdfw err ruleexists < fwdfw err same < fwdfw err samesub < fwdfw err src_addr -< fwdfw err srcovpn -< fwdfw err srcport < fwdfw err tgt_addr < fwdfw err tgt_grp < fwdfw err tgt_mac -< fwdfw err tgtovpn -< fwdfw err tgtport < fwdfw err tgt_port < fwdfw err time < fwdfw final_rule @@ -1261,12 +1246,10 @@ < fwdfw ACCEPT < fwdfw action < fwdfw additional -< fwdfw addr grp < fwdfw addrule +< fwdfw all icmp < fwdfw change < fwdfw copy -< fwdfw cust addr -< fwdfw cust net < fwdfw delete < fwdfw dnat < fwdfw dnat error @@ -1277,19 +1260,16 @@ < fwdfw err nosrcip < fwdfw err notgt < fwdfw err notgtip -< fwdfw err prot +< fwdfw err prot_port +< fwdfw err prot_port1 < fwdfw err remark < fwdfw err ruleexists < fwdfw err same < fwdfw err samesub < fwdfw err src_addr -< fwdfw err srcovpn -< fwdfw err srcport < fwdfw err tgt_addr < fwdfw err tgt_grp < fwdfw err tgt_mac -< fwdfw err tgtovpn -< fwdfw err tgtport < fwdfw err tgt_port < fwdfw err time < fwdfw final_rule diff --git a/langs/de/cgi-bin/de.pl b/langs/de/cgi-bin/de.pl index f6b22ec0f..48ee78b30 100644 --- a/langs/de/cgi-bin/de.pl +++ b/langs/de/cgi-bin/de.pl @@ -912,7 +912,6 @@ 'fw settings dropdown' => 'Alle Netzwerke auf Regelerstellungsseite anzeigen', 'fw settings remark' => 'Anmerkungen in Regeltabelle anzeigen', 'fw settings ruletable' => 'Leere Regeltabellen anzeigen', -'fwdfw all icmp' => 'Alle ICMP-Typen', 'fwdfw ACCEPT' => 'Akzeptieren (ACCEPT)', 'fwdfw DROP' => 'Verwerfen (DROP)', 'fwdfw MODE1' => 'Alle Pakete verwerfen', @@ -920,12 +919,10 @@ 'fwdfw REJECT' => 'Verweigern (REJECT)', 'fwdfw action' => 'Aktion', 'fwdfw additional' => 'Weitere Einstellungen', -'fwdfw addr grp' => 'Adressgruppen:', 'fwdfw addrule' => 'Regel hinzufügen/ändern:', +'fwdfw all icmp' => 'Alle ICMP-Typen', 'fwdfw change' => 'Aktualisieren', 'fwdfw copy' => 'Kopieren', -'fwdfw cust addr' => 'Custom Adressen:', -'fwdfw cust net' => 'Custom Netzwerke:', 'fwdfw delete' => 'Löschen', 'fwdfw dnat' => 'DNAT/Port-Weiterleitung', 'fwdfw dnat error' => 'Für Destination-NAT muss ein einzelner Host als Ziel ausgewählt werden. Gruppen oder Netzwerke sind nicht erlaubt', @@ -935,7 +932,6 @@ 'fwdfw err nosrcip' => 'Bitte Quell-IP-Adresse angeben', 'fwdfw err notgt' => 'Kein Ziel ausgewählt', 'fwdfw err notgtip' => 'Bitte Ziel-IP-Adresse angeben', -'fwdfw err prot' => 'Quell- und Zielprotokoll müssen identisch sein', 'fwdfw err prot_port' => 'Bei dem gewählten Protokoll sind Quell- und Zielport nicht erlaubt', 'fwdfw err prot_port1' => 'Bei Nutzung von Quell- oder Zielport muss als Protokoll TCP oder UDP gewählt werden.', 'fwdfw err remark' => 'Die Bemerkung enthält ungültige Zeichen', @@ -943,14 +939,10 @@ 'fwdfw err same' => 'Quelle und Ziel sind identisch', 'fwdfw err samesub' => 'Quell- und Ziel-IP-Adresse befinden sich im selben Subnetz', 'fwdfw err src_addr' => 'Quell-MAC/IP-Adresse ungültig', -'fwdfw err srcovpn' => 'Die gewählte Quell-IP-Adresse wird bereits von einem OpenVPN-Client genutzt. Bitte wählen Sie die passende Verbindung direkt aus.', -'fwdfw err srcport' => 'Bitte Quellport angeben', 'fwdfw err tgt_addr' => 'Ungültige Ziel-IP-Adresse', 'fwdfw err tgt_grp' => 'Die Ziel-Dienstgruppe ist leer', 'fwdfw err tgt_mac' => 'MAC-Adressen können nicht als Ziel defininert werden', 'fwdfw err tgt_port' => 'Ungültiger Zielport', -'fwdfw err tgtovpn' => 'Die gewählte Ziel-IP-Adresse wird bereits von einem OpenVPN-Client genutzt. Bitte wählen Sie die passende Verbindung direkt aus.', -'fwdfw err tgtport' => 'Bitte Zielport angeben', 'fwdfw err time' => 'Es muss mindestens ein Tag ausgewählt werden', 'fwdfw final_rule' => 'Letzte Regel: ', 'fwdfw from' => 'Von:', diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl index 4c1c46508..d76f76c55 100644 --- a/langs/en/cgi-bin/en.pl +++ b/langs/en/cgi-bin/en.pl @@ -937,7 +937,6 @@ 'fw settings dropdown' => 'Show all networks on rulecreation site', 'fw settings remark' => 'Show remarks in ruletable', 'fw settings ruletable' => 'Show empty ruletables', -'fwdfw all icmp' => 'All ICMP-Types', 'fwdfw ACCEPT' => 'ACCEPT', 'fwdfw DROP' => 'DROP', 'fwdfw MODE1' => 'Drop all packets', @@ -945,12 +944,10 @@ 'fwdfw REJECT' => 'REJECT', 'fwdfw action' => 'Action', 'fwdfw additional' => 'Additional settings', -'fwdfw addr grp' => 'Adress groups:', 'fwdfw addrule' => 'Add/Edit rule:', +'fwdfw all icmp' => 'All ICMP-Types', 'fwdfw change' => 'Update', 'fwdfw copy' => 'Copy', -'fwdfw cust addr' => 'Custom addresses:', -'fwdfw cust net' => 'Custom networks:', 'fwdfw delete' => 'Delete', 'fwdfw dnat' => 'Port forwarding/Destination NAT', 'fwdfw dnat error' => 'You have to select a single host for DNAT. Groups or networks are not allowed.', @@ -960,7 +957,6 @@ 'fwdfw err nosrcip' => 'Please provide a source IP address.', 'fwdfw err notgt' => 'No destination selected.', 'fwdfw err notgtip' => 'Please provide a destination IP address.', -'fwdfw err prot' => 'Source and destination protocol need to match.', 'fwdfw err prot_port' => 'Source- or targetport are not allowed with selected protocol', 'fwdfw err prot_port1' => 'When using Source- or targetport you have to select TCP or UDP for protocol', 'fwdfw err remark' => 'Invalid characters in remark.', @@ -968,14 +964,10 @@ 'fwdfw err same' => 'Source and destination are identical.', 'fwdfw err samesub' => 'Source and destination IP addresses are from the same subnet.', 'fwdfw err src_addr' => 'Invalid source MAC/IP address.', -'fwdfw err srcovpn' => 'The entered source IP address is used by an OpenVPN client. Please use the dropdown menu and select the right client connection.', -'fwdfw err srcport' => 'Please provide a source port.', 'fwdfw err tgt_addr' => 'Invalid destination IP address.', 'fwdfw err tgt_grp' => 'The destination service group is empty', 'fwdfw err tgt_mac' => 'A MAC addresses cannot be used as destination.', 'fwdfw err tgt_port' => 'Invalid destination port.', -'fwdfw err tgtovpn' => 'The entered destination IP address is used by an OpenVPN client. Please use the dropdown menu and select the right client connection.', -'fwdfw err tgtport' => 'Please provide a destination port.', 'fwdfw err time' => 'You have to select at least one day.', 'fwdfw final_rule' => 'Last rule: ', 'fwdfw from' => 'From:', -- 2.39.2