diff --git a/firewall/cluster.cgi b/firewall/cluster.cgi index 3ec5066a8..1cb5e413b 100755 --- a/firewall/cluster.cgi +++ b/firewall/cluster.cgi @@ -7,7 +7,7 @@ if (&get_ipvx_version() == 6) { require './firewall6-lib.pl'; } else { require './firewall4-lib.pl'; } $access{'cluster'} || &error($text{'ecluster'}); &foreign_require("servers", "servers-lib.pl"); -&ui_print_header(undef, $text{'cluster_title'}, undef, "cluster"); +&ui_print_header($text{"index_title_v${ipvx}"}, $text{'cluster_title'}, undef, "cluster"); # Show existing servers @servers = &list_cluster_servers(); diff --git a/firewall/cluster_add.cgi b/firewall/cluster_add.cgi index d7cb13b15..c945a6514 100755 --- a/firewall/cluster_add.cgi +++ b/firewall/cluster_add.cgi @@ -26,7 +26,7 @@ else { $msg = &text('add_gmsg', $in{'group'}); } -&ui_print_header(undef, $text{'add_title'}, ""); +&ui_print_header($text{"index_title_v${ipvx}"}, $text{'add_title'}, ""); print "$msg

\n"; # Setup error handler for down hosts diff --git a/firewall/cluster_delete.cgi b/firewall/cluster_delete.cgi index 79da6b4e8..3c9f56cb7 100755 --- a/firewall/cluster_delete.cgi +++ b/firewall/cluster_delete.cgi @@ -1,4 +1,5 @@ #!/usr/local/bin/perl + # Remove some servers from the managed list require './firewall-lib.pl'; diff --git a/firewall/edit_rule.cgi b/firewall/edit_rule.cgi index 44eceaa95..9b108be05 100755 --- a/firewall/edit_rule.cgi +++ b/firewall/edit_rule.cgi @@ -10,17 +10,17 @@ if (&get_ipvx_version() == 6) { require './firewall6-lib.pl'; $table = $tables[$in{'table'}]; &can_edit_table($table->{'name'}) || &error($text{'etable'}); if ($in{'clone'} ne '') { - &ui_print_header(undef, $text{'edit_title3'}, ""); + &ui_print_header($text{"index_title_v${ipvx}"}, $text{'edit_title3'}, ""); %clone = %{$table->{'rules'}->[$in{'clone'}]}; $rule = \%clone; } elsif ($in{'new'}) { - &ui_print_header(undef, $text{'edit_title1'}, ""); + &ui_print_header($text{"index_title_v${ipvx}"}, $text{'edit_title1'}, ""); $rule = { 'chain' => $in{'chain'}, 'j' => &can_jump('DROP') ? 'DROP' : "" }; } else { - &ui_print_header(undef, $text{'edit_title2'}, ""); + &ui_print_header($text{"index_title_v${ipvx}"}, $text{'edit_title2'}, ""); $rule = $table->{'rules'}->[$in{'idx'}]; &can_jump($rule) || &error($text{'ejump'}); } diff --git a/firewall/index.cgi b/firewall/index.cgi index 5a7f161bd..0ca448c90 100755 --- a/firewall/index.cgi +++ b/firewall/index.cgi @@ -12,13 +12,13 @@ if (&get_ipvx_version() == 6) { require './firewall6-lib.pl'; if ($ipvx_save) { $desc = &text('index_editing', "$ipvx_save"); } -&ui_print_header(undef, $text{'index_title'}, undef, "intro", 1, 1, 0, +&ui_print_header($text{"index_title_v${ipvx}"}, $text{'index_title'}, undef, "intro", 1, 1, 0, &help_search_link("ip${ipvx}tables", "man", "doc")); #print tabs for IPv4 and IPv6 print <

  • -$text{'index_title_v4'} +$text{'index_title_v'}
  • diff --git a/firewall/lang/ca b/firewall/lang/ca index 49fab0954..4029fe0dc 100644 --- a/firewall/lang/ca +++ b/firewall/lang/ca @@ -1,4 +1,4 @@ -index_title=Tallafocs Linux +index_title=Tallafocs Linux IPTables index_editing=Fitxer de regles $1 index_ecommand=No s'ha trobat al sistema l'ordre $1. Webmin necessita aquesta ordre per configurar IPtables. index_ekernel=S'ha produït un error en comprovar la configuració actual d'IPtables: $1 Això pot indicar que el nucli no suporta IPtables. diff --git a/firewall/lang/cz b/firewall/lang/cz index 10d34bc25..0f5e1faaf 100644 --- a/firewall/lang/cz +++ b/firewall/lang/cz @@ -218,7 +218,7 @@ index_shorewall=Pozor! Vypad index_table_filter=Filtrování packetù (filter) index_table_mangle=Zmìna paketù (mangle) index_table_nat=Pøeklad sí»ové adresy (nat) -index_title=Firewall Linuxu +index_title=Firewall IPTables Linuxu index_unapply=Navrátit konfiguraci index_unapplydesc=Klepnutím na toto tlaèítko se resetuje konfigurace uvedená vý¹e na jednu z právì aktivních konfigurací. log_add_group=Pøidány do clusteru servery ze skupiny $1 diff --git a/firewall/lang/de b/firewall/lang/de index f18f2e48f..0a127a998 100644 --- a/firewall/lang/de +++ b/firewall/lang/de @@ -232,7 +232,7 @@ index_shorewall=Hinweis! Es scheint, dass Shorewall verwendet wird, um das Firew index_table_filter=Packet filtering (filter) index_table_mangle=Packet alteration (mangle) index_table_nat=Netzwerk Adress Translation (NAT) -index_title=Linux Firewall +index_title=Linux IPTables Firewall index_unapply=Konfiguration zurücksetzen index_unapply2=Speichere Konfiguration index_unapply2desc=Klicke auf diese Schaltfläche, um die Konfiguration oben in die permanente Firewall-Konfigurationsdatei zu speichern. diff --git a/firewall/lang/en b/firewall/lang/en index c503b5a64..f1515ed5a 100644 --- a/firewall/lang/en +++ b/firewall/lang/en @@ -1,5 +1,5 @@ -index_title=Linux Firewall -index_title_v4=IPv4 Firewall +index_title=Linux IPTables Firewall +index_title_v=IPv4 Firewall index_title_v6=IPv6 Firewall index_editing=Rules file $1 index_ecommand=The command $1 was not found on your system. Webmin needs this command to configure IPtables. diff --git a/firewall/lang/es b/firewall/lang/es index a148329e5..d89e86634 100644 --- a/firewall/lang/es +++ b/firewall/lang/es @@ -1,4 +1,4 @@ -index_title=Firewall +index_title=Firewall IPTables index_ecommand=El comando $1 no se encontro en su sistema. Allconnections necesita este comando para configurar el firewall. index_ekernel=Ocurrio un error al comprobar su configuracion de firewall actual: esto puede indicar que su kernel no tiene soporte de Firewall index_header=Configuracion de firewall para $1 diff --git a/firewall/lang/fr b/firewall/lang/fr index d729e185d..5c296ba52 100644 --- a/firewall/lang/fr +++ b/firewall/lang/fr @@ -201,7 +201,7 @@ index_shorewall=Attention! Il semble que Shorewall soit utilisé pour gé index_table_filter=Filtrage de paquets (filter) index_table_mangle=Altération de paquets (mangle) index_table_nat=Translation d'adresses réseau (nat) -index_title=Firewall Linux +index_title=Firewall IPTables Linux index_unapply=Rétablir la Configuration index_unapplydesc=Cliquez sur ce bouton pour rétablir la configuration listée ci-dessus en fonction de celle actuellement active. log_apply=Configuration appliqué diff --git a/firewall/lang/hu b/firewall/lang/hu index 926921289..0a61c473f 100644 --- a/firewall/lang/hu +++ b/firewall/lang/hu @@ -1,4 +1,4 @@ -index_title=Linux Firewall +index_title=Linux IPTables Firewall index_editing=Rules file $1 index_ecommand=The command $1 was not found on your system. Webmin needs this command to configure IPtables. index_ekernel=An error occured when checking your current IPtables configuration : $1 This may indicate that your kernel does not support IPtables. diff --git a/firewall/lang/it b/firewall/lang/it index 9a68c9b56..9694eb192 100644 --- a/firewall/lang/it +++ b/firewall/lang/it @@ -1,7 +1,7 @@ # ../firewall/lang/it # Tradotto il 24 Dicembre 2002 alle 12.10 da Michele (M@Z) Azzolari - MILANO (ITALY) -index_title=Linux Firewall +index_title=Linux IPTables Firewall index_ecommand=Il comando $1 non è stato trovato sul tuo sistema. Webmin ha bisogno di questo comando per configurare IPtables. index_ekernel=Si è verificato un errore rilevando la tua configurazione di IPtables: $1. Questo può indicare che il tuo kernel non supporta IPtables. index_header=Configurazione del Firewall da $1 diff --git a/firewall/lang/ja_JP.euc b/firewall/lang/ja_JP.euc index 10742a99d..e12f4259a 100644 --- a/firewall/lang/ja_JP.euc +++ b/firewall/lang/ja_JP.euc @@ -172,7 +172,7 @@ index_shorewall= index_table_filter=¥Ñ¥±¥Ã¥È¥Õ¥£¥ë¥¿¥ê¥ó¥° (filter) index_table_mangle=¥Ñ¥±¥Ã¥ÈÊÑ´¹ index_table_nat=¥Í¥Ã¥È¥ï¡¼¥¯¥¢¥É¥ì¥¹ÊÑ´¹ (nat) -index_title=Linux ¥Õ¥¡¥¤¥ä¥¦¥©¡¼¥ë +index_title=Linux IPTables ¥Õ¥¡¥¤¥ä¥¦¥©¡¼¥ë index_unapply=¸µ¤ËÌ᤹ index_unapplydesc=¤³¤Î¥Ü¥¿¥ó¤ò¥¯¥ê¥Ã¥¯¤¹¤ë¤È¥ê¥¹¥È¤µ¤ì¤¿ÀßÄê¤ò¥ê¥»¥Ã¥È¤·¸½ºßÍ­¸ú¤ÊÀßÄê¤ò¥ê¥¹¥È¤·¤Þ¤¹¡£ log_apply=Êѹ¹¤òŬÍѤ·¤¿ diff --git a/firewall/lang/nl b/firewall/lang/nl index 6eaa2ce84..43b1ffe58 100644 --- a/firewall/lang/nl +++ b/firewall/lang/nl @@ -231,7 +231,7 @@ index_shorewall=Waarschuwing! Het lijkt erop dat Shorewall word gebruikt om uw s index_table_filter=Pakket filteren (filter) index_table_mangle=Pakket wijziging (mangle) index_table_nat=Netwerk adres vertaling (NAT) -index_title=Linux Firewall +index_title=Linux IPTables Firewall index_unapply=Omkeren Configuratie index_unapplydesc=Klik op deze knop om de configuratie die hierboven staat te resetten naar de configuratie die op dit moment actief is log_add_group=Toegevoegde cluster servers van groep $1 diff --git a/firewall/lang/no b/firewall/lang/no index 5e9190687..304fceda0 100644 --- a/firewall/lang/no +++ b/firewall/lang/no @@ -232,7 +232,7 @@ index_shorewall=Warning! It appears that Shorewall is being used to generate you index_table_filter=Pakkefiltrering (filter) index_table_mangle=Pakke endring (mangle) index_table_nat=Nettverksadresse oversetting (nat) -index_title=Linux brannmur +index_title=Linux IPTables brannmur index_unapply=Tilbakestill konfigurasjon index_unapply2=Lagre konfigurasjon index_unapply2desc=Klikk på denne knappen for å lagre konfigurasjonen ovenfor i den permanente brannmur-konfigurasjonsfilen diff --git a/firewall/lang/pl b/firewall/lang/pl index 3702ada66..d99b99768 100644 --- a/firewall/lang/pl +++ b/firewall/lang/pl @@ -232,7 +232,7 @@ index_shorewall=Uwaga! Wygl index_table_filter=Filtracja pakietu (filter) index_table_mangle=Przeróbka pakietu (mangle) index_table_nat=Translacja adresów sieciowych (nat) -index_title=Firewall Linuksa +index_title=Firewall IPTables Linuksa index_unapply=Przywróæ konfiguracjê index_unapply2=Zapisz konfiguracjê index_unapply2desc=Kliknij na ten przycisk, aby zapisaæ powy¿sz± konfiguracjê do pliku konfiguracyjnego firewalla. diff --git a/firewall/lang/pt_BR b/firewall/lang/pt_BR index 165b5d0c5..77de128c5 100644 --- a/firewall/lang/pt_BR +++ b/firewall/lang/pt_BR @@ -219,7 +219,7 @@ index_shorewall=Aviso! Parece que o Shorewall está sendo usado para gerar s index_table_filter=Filtragem de pacotes (filter) index_table_mangle=Alteração de pacotes (mangle) index_table_nat=Tradução de endereço de rede (nat) -index_title=Linux Firewall +index_title=Linux IPTables Firewall index_unapply=Reverter Configuração index_unapplydesc=Clique neste botão para reiniciar as configurações listadas acima para a que estiver em uso atual. log_add_group=Adicionando servidores clusters do grupo $1 diff --git a/firewall/lang/ru_RU b/firewall/lang/ru_RU index 5f78d47da..2cf804a46 100644 --- a/firewall/lang/ru_RU +++ b/firewall/lang/ru_RU @@ -127,7 +127,7 @@ apply_err= index_radd=Äîáàâèòü ïðàâèëî index_ecommand=Êîìàíäà $1 â âàøåé ñèñòåìå íå îáíàðóæåíà. Ýòà êîìàíäà íåîáõîäèìà Webmin äëÿ íàñòðîéêè IPtables. edit_ports=Ïîðò(û) èñòî÷íèêà èëè íàçíà÷åíèÿ ( --ports ) -index_title=Ìåæñåòåâîé ýêðàí Linux (firewall) +index_title=Ìåæñåòåâîé ýêðàí Linux IPTables (firewall) save_egidowner=Ãðóïïà unix íå óêàçàíà èëè óêàçàíà íåâåðíî edit_state=Ñîñòîÿíèå ñîåäèíåíèÿ ( --state ) edit_tcpoption=Íîìåðîì TCP îïöèè ( --tcp-option ) diff --git a/firewall/lang/ru_SU b/firewall/lang/ru_SU index 18cb98675..910d5ec3c 100644 --- a/firewall/lang/ru_SU +++ b/firewall/lang/ru_SU @@ -221,7 +221,7 @@ index_shorewall= index_table_filter=æÉÌØÔÒÏ×ÁÎÉÅ ÐÁËÅÔÏ× (filter) index_table_mangle=éÚÍÅÎÅÎÉÅ ÐÁËÅÔÏ× (mangle) index_table_nat=ðÒÅÏÂÒÁÚÏ×ÁÎÉÅ ÓÅÔÅ×ÙÈ ÁÄÒÅÓÏ× (nat) -index_title=íÅÖÓÅÔÅ×ÏÊ ÜËÒÁÎ Linux (firewall) +index_title=íÅÖÓÅÔÅ×ÏÊ ÜËÒÁÎ Linux IPTables (firewall) index_unapply=÷ÅÒÎÕÔØ ËÏÎÆÉÇÕÒÁÃÉÀ index_unapplydesc=îÁÖÁÔÉÅ ÎÁ ÜÔÕ ËÎÏÐËÕ ÐÒÉ×ÅÄÅÔ Ë ÓÂÒÏÓÕ ×ÙÛÅÐÒÉ×ÅÄÅÎÎÏÊ ËÏÎÆÉÇÕÒÁÃÉÉ Ë ÁËÔÉ×ÎÏÊ × ÄÁÎÎÙÊ ÍÏÍÅÎÔ × ÑÄÒÅ. log_add_group=äÏÂÁ×ÌÅÎÙ ÓÅÒ×ÅÒÙ ËÌÁÓÔÅÒÁ ÉÚ ÇÒÕÐÐÙ $1 diff --git a/firewall/lang/sk b/firewall/lang/sk index 610cd5e76..7188bd29f 100644 --- a/firewall/lang/sk +++ b/firewall/lang/sk @@ -219,7 +219,7 @@ index_shorewall=Varovanie! Zd index_table_filter=Filtrovanie paketov (filter) index_table_mangle=Zmena paketov (mangle) index_table_nat=Preklad sie»ovej adresy (nat) -index_title=Firewall Linuxu +index_title=Firewall IPTables Linuxu index_unapply=Vráti» konfiguráciu index_unapplydesc=Na toto tlaèidlo kliknite, ak chcete zru¹i» konfiguráciu zobrazenú vy¹¹ie a obnovi» tú, èo je práve aktívna. log_add_group=Pridané cluster servery zo skupiny $1 diff --git a/firewall/lang/tr b/firewall/lang/tr index 81c6ecbcd..727dd0453 100644 --- a/firewall/lang/tr +++ b/firewall/lang/tr @@ -216,7 +216,7 @@ index_shorewall=Uyar index_table_filter=Paket filtreleme (filtre) index_table_mangle=Paket deðiþikliði (mangle) index_table_nat=Að adres çevirisi (nat) -index_title=Linux Güvenlik Duvarý +index_title=Linux IPTables Güvenlik Duvarý index_unapply=Yapýlandýrmayý Geri Al index_unapplydesc=Yukarýda listelenen yapýlandýrmayý halen aktif olan yapýlandýrmayla deðiþtirmek için bu tuþa basýn. log_add_group=$1 grubundan küme sunucularý eklendi diff --git a/firewall/lang/uk_UA b/firewall/lang/uk_UA index aa6e06436..93ce42bdb 100644 --- a/firewall/lang/uk_UA +++ b/firewall/lang/uk_UA @@ -129,7 +129,7 @@ apply_err= index_radd=Äîäàòè ïðàâèëî index_ecommand=Êîìàíäà $1 ó âàø³é ñèñòåì³ íå âèÿâëåíà. Öÿ êîìàíäà íåîáõ³äíà Webmin äëÿ íàñòðîþâàííÿ IPtables. edit_ports=Ïîðò(û) äæåðåëà ³ ïðèçíà÷åííÿ -index_title=̳æìåðåæåâèé åêðàí Linux (firewall) +index_title=̳æìåðåæåâèé åêðàí Linux IPTables (firewall) save_egidowner=Ãðóïà unix ÷è íå çàçíà÷åíà çàçíà÷åíà íåâ³ðíî edit_state=Ñòàíó ç'ºäíàííÿ edit_tcpoption=Âñòàíîâëåíà îïö³ÿ TCP ç íîìåðîì diff --git a/firewall/save_policy.cgi b/firewall/save_policy.cgi index a26743bf9..627d14399 100755 --- a/firewall/save_policy.cgi +++ b/firewall/save_policy.cgi @@ -52,7 +52,7 @@ elsif ($in{'delete'} || $in{'clear'}) { # Ask for confirmation on deleting the chain $mode = $in{'delete'} ? "delete" : "clear"; $access{'delchain'} || &error($text{$mode.'_ecannot'}); - &ui_print_header(undef, $text{$mode.'_title'}, ""); + &ui_print_header($text{"index_title_v${ipvx}"}, $text{$mode.'_title'}, ""); @rules = grep { $_->{'chain'} eq $in{'chain'} } @{$table->{'rules'}}; print &ui_form_start("save_policy.cgi"); @@ -107,7 +107,7 @@ elsif ($in{'rename'} && $in{'newname'}) { } elsif ($in{'rename'}) { # Show chain rename form - &ui_print_header(undef, $text{'rename_title'}, ""); + &ui_print_header($text{"index_title_v${ipvx}"}, $text{'rename_title'}, "") print &ui_form_start("save_policy.cgi"); print &ui_hidden("version", ${ipvx_arg}); @@ -177,7 +177,7 @@ elsif ($in{'movesel'} && $in{'dest'}) { } elsif ($in{'movesel'}) { # Show rule move form - &ui_print_header(undef, $text{'move_title'}, ""); + &ui_undef, $text{'move_title'}, ""); print &ui_form_start("save_policy.cgi"); print &ui_hidden("version", ${ipvx_arg});