diff --git a/doc/language_issues.de b/doc/language_issues.de index 486ecba0d..25612b5b7 100644 --- a/doc/language_issues.de +++ b/doc/language_issues.de @@ -226,6 +226,14 @@ WARNING: translation string unused: fwdfw std network WARNING: translation string unused: fwdfw till WARNING: translation string unused: fwdfw time WARNING: translation string unused: fwdfw xt access +WARNING: translation string unused: fwhost Custom Host +WARNING: translation string unused: fwhost Custom Network +WARNING: translation string unused: fwhost IpSec Host +WARNING: translation string unused: fwhost IpSec Network +WARNING: translation string unused: fwhost OpenVPN N-2-N +WARNING: translation string unused: fwhost OpenVPN static host +WARNING: translation string unused: fwhost OpenVPN static network +WARNING: translation string unused: fwhost Standard Network WARNING: translation string unused: fwhost attention WARNING: translation string unused: fwhost blue WARNING: translation string unused: fwhost changeremark diff --git a/doc/language_issues.en b/doc/language_issues.en index e968b591a..e6af830a5 100644 --- a/doc/language_issues.en +++ b/doc/language_issues.en @@ -248,6 +248,14 @@ WARNING: translation string unused: fwdfw std network WARNING: translation string unused: fwdfw till WARNING: translation string unused: fwdfw time WARNING: translation string unused: fwdfw xt access +WARNING: translation string unused: fwhost Custom Host +WARNING: translation string unused: fwhost Custom Network +WARNING: translation string unused: fwhost IpSec Host +WARNING: translation string unused: fwhost IpSec Network +WARNING: translation string unused: fwhost OpenVPN N-2-N +WARNING: translation string unused: fwhost OpenVPN static host +WARNING: translation string unused: fwhost OpenVPN static network +WARNING: translation string unused: fwhost Standard Network WARNING: translation string unused: fwhost attention WARNING: translation string unused: fwhost blue WARNING: translation string unused: fwhost changeremark diff --git a/doc/language_missings b/doc/language_missings index 3f1f997dd..742f1f750 100644 --- a/doc/language_missings +++ b/doc/language_missings @@ -226,6 +226,8 @@ < fwhost cust addr < fwhost cust grp < fwhost cust net +< fwhost Custom Host +< fwhost Custom Network < fwhost cust service < fwhost cust srvgrp < fwhost deleted @@ -267,7 +269,9 @@ < fwhost ipadr < fwhost ip_mac < fwhost ipsec host +< fwhost IpSec Host < fwhost ipsec net +< fwhost IpSec Network < fwhost menu < fwhost netaddress < fwhost newgrp @@ -275,6 +279,9 @@ < fwhost newnet < fwhost newservice < fwhost newservicegrp +< fwhost OpenVPN N-2-N +< fwhost OpenVPN static host +< fwhost OpenVPN static network < fwhost orange < fwhost ovpn_n2n < fwhost port @@ -283,6 +290,7 @@ < fwhost reset < fwhost services < fwhost srv_name +< fwhost Standard Network < fwhost stdnet < fwhost type < fwhost used @@ -694,6 +702,8 @@ < fwhost cust addr < fwhost cust grp < fwhost cust net +< fwhost Custom Host +< fwhost Custom Network < fwhost cust service < fwhost cust srvgrp < fwhost deleted @@ -735,7 +745,9 @@ < fwhost ipadr < fwhost ip_mac < fwhost ipsec host +< fwhost IpSec Host < fwhost ipsec net +< fwhost IpSec Network < fwhost menu < fwhost netaddress < fwhost newgrp @@ -743,6 +755,9 @@ < fwhost newnet < fwhost newservice < fwhost newservicegrp +< fwhost OpenVPN N-2-N +< fwhost OpenVPN static host +< fwhost OpenVPN static network < fwhost orange < fwhost ovpn_n2n < fwhost port @@ -751,6 +766,7 @@ < fwhost reset < fwhost services < fwhost srv_name +< fwhost Standard Network < fwhost stdnet < fwhost type < fwhost used @@ -1146,6 +1162,8 @@ < fwhost cust addr < fwhost cust grp < fwhost cust net +< fwhost Custom Host +< fwhost Custom Network < fwhost cust service < fwhost cust srvgrp < fwhost deleted @@ -1187,7 +1205,9 @@ < fwhost ipadr < fwhost ip_mac < fwhost ipsec host +< fwhost IpSec Host < fwhost ipsec net +< fwhost IpSec Network < fwhost menu < fwhost netaddress < fwhost newgrp @@ -1195,6 +1215,9 @@ < fwhost newnet < fwhost newservice < fwhost newservicegrp +< fwhost OpenVPN N-2-N +< fwhost OpenVPN static host +< fwhost OpenVPN static network < fwhost orange < fwhost ovpn_n2n < fwhost port @@ -1203,6 +1226,7 @@ < fwhost reset < fwhost services < fwhost srv_name +< fwhost Standard Network < fwhost stdnet < fwhost type < fwhost used @@ -1587,6 +1611,8 @@ < fwhost cust addr < fwhost cust grp < fwhost cust net +< fwhost Custom Host +< fwhost Custom Network < fwhost cust service < fwhost cust srvgrp < fwhost deleted @@ -1628,7 +1654,9 @@ < fwhost ipadr < fwhost ip_mac < fwhost ipsec host +< fwhost IpSec Host < fwhost ipsec net +< fwhost IpSec Network < fwhost menu < fwhost netaddress < fwhost newgrp @@ -1636,6 +1664,9 @@ < fwhost newnet < fwhost newservice < fwhost newservicegrp +< fwhost OpenVPN N-2-N +< fwhost OpenVPN static host +< fwhost OpenVPN static network < fwhost orange < fwhost ovpn_n2n < fwhost port @@ -1644,6 +1675,7 @@ < fwhost reset < fwhost services < fwhost srv_name +< fwhost Standard Network < fwhost stdnet < fwhost type < fwhost used diff --git a/html/cgi-bin/fwhosts.cgi b/html/cgi-bin/fwhosts.cgi index e8ddf461e..c5e1c2845 100644 --- a/html/cgi-bin/fwhosts.cgi +++ b/html/cgi-bin/fwhosts.cgi @@ -909,9 +909,6 @@ if ($fwhostsettings{'ACTION'} eq 'deletegrphost') } &General::writehasharray("$configgrp", \%customgrp); &General::firewall_config_changed(); - if ($fwhostsettings{'grpcnt'} > 0){ - &General::firewall_config_changed(); - } if ($fwhostsettings{'update'} eq 'on'){ $fwhostsettings{'remark'}= $grpremark; $fwhostsettings{'grp_name'}=$grpname; @@ -1843,11 +1840,11 @@ sub viewtablegrp print "$customgrp{$key}[2]"; } if ($ip eq '' && $customgrp{$key}[2] ne $Lang::tr{'fwhost err emptytable'}){ - print "$Lang::tr{'fwhost deleted'}$customgrp{$key}[3]
"; + print "$Lang::tr{'fwhost deleted'}$Lang::tr{'fwhost '.$customgrp{$key}[3]}"; }else{ my ($colip,$colsub) = split("/",$ip); $ip="$colip/".&General::iporsubtocidr($colsub) if ($colsub); - print"".&getcolor($ip)."$customgrp{$key}[3]"; + print"".&getcolor($ip)."$Lang::tr{'fwhost '.$customgrp{$key}[3]}"; } if ($delflag > 0 && $ip ne ''){ print""; @@ -1858,8 +1855,7 @@ sub viewtablegrp } } } - print"
"; - + print""; $helper=$customgrp{$key}[0]; $number++; } diff --git a/langs/de/cgi-bin/de.pl b/langs/de/cgi-bin/de.pl index 74bd6e887..7c1762133 100644 --- a/langs/de/cgi-bin/de.pl +++ b/langs/de/cgi-bin/de.pl @@ -18,8 +18,8 @@ 'ConnSched dial' => 'Verbinden', 'ConnSched down' => 'Runter', 'ConnSched hangup' => 'Trennen', -'ConnSched ipsecstart' => 'IPSec (neu)starten', -'ConnSched ipsecstop' => 'IPSec stop', +'ConnSched ipsecstart' => 'IPsec (neu)starten', +'ConnSched ipsecstop' => 'IPsec stop', 'ConnSched reboot' => 'Neustarten', 'ConnSched reconnect' => 'Neu verbinden', 'ConnSched scheduled actions' => 'Geplante Aktionen', @@ -1030,6 +1030,14 @@ 'fwdfw wd_tue' => 'Di', 'fwdfw wd_wed' => 'Mi', 'fwdfw xt access' => 'Input', +'fwhost Custom Host' => 'Host', +'fwhost Custom Network' => 'Netzwerk', +'fwhost IpSec Host' => 'IPsec-Host', +'fwhost IpSec Network' => 'IPsec-Netzwerk', +'fwhost OpenVPN N-2-N' => 'OpenVPN Netz-zu-Netz', +'fwhost OpenVPN static host' => 'OpenVPN statischer Host', +'fwhost OpenVPN static network' => 'OpenVPN statisches Netzwerk', +'fwhost Standard Network' => 'Standard-Netzwerk', 'fwhost addgrp' => 'Neue Gruppe hinzufügen', 'fwhost addgrpname' => 'Gruppenname:', 'fwhost addhost' => 'Neuen Host hinzufügen', diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl index f8cdf7630..a8e55f571 100644 --- a/langs/en/cgi-bin/en.pl +++ b/langs/en/cgi-bin/en.pl @@ -18,8 +18,8 @@ 'ConnSched dial' => 'Connect', 'ConnSched down' => 'Down', 'ConnSched hangup' => 'Disconnect', -'ConnSched ipsecstart' => 'IPSec (re)start', -'ConnSched ipsecstop' => 'IPSec stop', +'ConnSched ipsecstart' => 'IPsec (re)start', +'ConnSched ipsecstop' => 'IPsec stop', 'ConnSched reboot' => 'Reboot', 'ConnSched reconnect' => 'Reconnect', 'ConnSched scheduled actions' => 'Scheduled actions', @@ -1056,6 +1056,14 @@ 'fwdfw wd_tue' => 'Tue', 'fwdfw wd_wed' => 'Wed', 'fwdfw xt access' => 'Input', +'fwhost Custom Host' => 'Host', +'fwhost Custom Network' => 'Network', +'fwhost IpSec Host' => 'IPsec host', +'fwhost IpSec Network' => 'IPsec network', +'fwhost OpenVPN N-2-N' => 'OpenVPN Net-to-Net', +'fwhost OpenVPN static host' => 'OpenVPN static host', +'fwhost OpenVPN static network' => 'OpenVPN static network', +'fwhost Standard Network' => 'Standard network', 'fwhost addgrp' => 'Add new network/host group', 'fwhost addgrpname' => 'Group name:', 'fwhost addhost' => 'Add new host', diff --git a/langs/es/cgi-bin/es.pl b/langs/es/cgi-bin/es.pl index edb8be0b5..19057c7a2 100644 --- a/langs/es/cgi-bin/es.pl +++ b/langs/es/cgi-bin/es.pl @@ -15,8 +15,8 @@ 'ConnSched change profile title' => 'Cambiar a perfil:', 'ConnSched days' => 'Días:', 'ConnSched down' => 'Abajo', -'ConnSched ipsecstart' => '(Re)iniciarIPSec', -'ConnSched ipsecstop' => 'Detener IPSec', +'ConnSched ipsecstart' => '(Re)iniciarIPsec', +'ConnSched ipsecstop' => 'Detener IPsec', 'ConnSched reconnect' => 'Reconectar', 'ConnSched scheduled actions' => 'Acciones planificadas', 'ConnSched scheduler' => 'Planificador', diff --git a/langs/fr/cgi-bin/fr.pl b/langs/fr/cgi-bin/fr.pl index 9f2e7857e..f80f11205 100644 --- a/langs/fr/cgi-bin/fr.pl +++ b/langs/fr/cgi-bin/fr.pl @@ -16,8 +16,8 @@ 'ConnSched change profile title' => 'Changer de profil :', 'ConnSched days' => 'Jours :', 'ConnSched down' => 'Arrêt', -'ConnSched ipsecstart' => 'IPSec (re)démarrage', -'ConnSched ipsecstop' => 'IPSec arrêt', +'ConnSched ipsecstart' => 'IPsec (re)démarrage', +'ConnSched ipsecstop' => 'IPsec arrêt', 'ConnSched reconnect' => 'Reconnecter', 'ConnSched scheduled actions' => 'Actions planifiées', 'ConnSched scheduler' => 'Planificateur', diff --git a/langs/nl/cgi-bin/nl.pl b/langs/nl/cgi-bin/nl.pl index 43d76ebf5..4bcb55074 100644 --- a/langs/nl/cgi-bin/nl.pl +++ b/langs/nl/cgi-bin/nl.pl @@ -16,8 +16,8 @@ 'ConnSched change profile title' => 'Gebruik profiel:', 'ConnSched days' => 'Dagen:', 'ConnSched down' => 'Omlaag', -'ConnSched ipsecstart' => 'IPSec (her)starten', -'ConnSched ipsecstop' => 'IPSec stoppen', +'ConnSched ipsecstart' => 'IPsec (her)starten', +'ConnSched ipsecstop' => 'IPsec stoppen', 'ConnSched reconnect' => 'Opnieuw verbinden', 'ConnSched scheduled actions' => 'Ingeplande acties', 'ConnSched scheduler' => 'Scheduler', diff --git a/langs/pl/cgi-bin/pl.pl b/langs/pl/cgi-bin/pl.pl index 80da6d63f..d6b9ab0b6 100644 --- a/langs/pl/cgi-bin/pl.pl +++ b/langs/pl/cgi-bin/pl.pl @@ -16,8 +16,8 @@ 'ConnSched change profile title' => 'Zmień na profil:', 'ConnSched days' => 'Dni:', 'ConnSched down' => 'Niżej', -'ConnSched ipsecstart' => '(Re)start IPSec', -'ConnSched ipsecstop' => 'Zatrzymanie IPSec', +'ConnSched ipsecstart' => '(Re)start IPsec', +'ConnSched ipsecstop' => 'Zatrzymanie IPsec', 'ConnSched reconnect' => 'Ponowne połączenie', 'ConnSched scheduled actions' => 'Zaplanowane zadania', 'ConnSched scheduler' => 'Harmonogram', diff --git a/langs/ru/cgi-bin/ru.pl b/langs/ru/cgi-bin/ru.pl index c1729b8a7..9ea9d6236 100644 --- a/langs/ru/cgi-bin/ru.pl +++ b/langs/ru/cgi-bin/ru.pl @@ -15,8 +15,8 @@ 'ConnSched change profile title' => 'Сменить профиль:', 'ConnSched days' => 'Дни:', 'ConnSched down' => 'Down', -'ConnSched ipsecstart' => 'IPSec (пере)запустить', -'ConnSched ipsecstop' => 'IPSec остановить', +'ConnSched ipsecstart' => 'IPsec (пере)запустить', +'ConnSched ipsecstop' => 'IPsec остановить', 'ConnSched reconnect' => 'Переподключить', 'ConnSched scheduled actions' => 'Действия по расписанию', 'ConnSched scheduler' => 'Расписание', diff --git a/langs/tr/cgi-bin/tr.pl b/langs/tr/cgi-bin/tr.pl index 445357567..146619a7a 100644 --- a/langs/tr/cgi-bin/tr.pl +++ b/langs/tr/cgi-bin/tr.pl @@ -16,8 +16,8 @@ 'ConnSched change profile title' => 'Profili değitirin:', 'ConnSched days' => 'Günler:', 'ConnSched down' => 'Aşağı', -'ConnSched ipsecstart' => 'IPSec yeniden başlat', -'ConnSched ipsecstop' => 'IPSec durudur', +'ConnSched ipsecstart' => 'IPsec yeniden başlat', +'ConnSched ipsecstop' => 'IPsec durudur', 'ConnSched reconnect' => 'Yeniden bağlan', 'ConnSched scheduled actions' => 'Planlanmış eylemler', 'ConnSched scheduler' => 'Zamanlayıcı', @@ -502,7 +502,7 @@ 'ccd err iroute' => 'Ağ adresi için geçersiz yol.', 'ccd err irouteexist' => 'Bu yol zaten kullanılıyor.', 'ccd err isipsecnet' => 'Verilen ağ adresi zaten bir IPsec ağ tarafından kullanılıyor.', -'ccd err isipsecrw' => 'Verilan ağ adresi zaten IPSec rw ağı tarafından kullanılıyor.', +'ccd err isipsecrw' => 'Verilan ağ adresi zaten IPsec rw ağı tarafından kullanılıyor.', 'ccd err isovpnn2n' => 'Bu alt ağ adresi zaten OpenVPN ağdan ağa bağlantısı için kullanılıyor.', 'ccd err isovpnnet' => 'Bu adres zaten OpenVPN Sunucusu için kullanılan alt ağ adresidir.', 'ccd err issubnet' => 'Bu adres zaten kullanımda olan bir alt ağ adresidir.',