webadmin/bpfire
1
0
Fork 0
mirror of https://github.com/vincentmli/bpfire.git synced 2026-04-12 04:05:53 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of ssh://git.ipfire.org/pub/git/ipfire-2.x

Browse Source
This commit is contained in:
Michael Tremer
2014-04-18 22:24:24 +02:00
parent 8490e49618 39e96de566
commit 8d2fe8cedd
12 changed files with 84 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
doc/language_issues.de
View File

@@ -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

8
doc/language_issues.en
View File

@@ -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

32
doc/language_missings
View File

@@ -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

10
html/cgi-bin/fwhosts.cgi
View File

@@ -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]</td>";
}
if ($ip eq '' && $customgrp{$key}[2] ne $Lang::tr{'fwhost err emptytable'}){
print "<td align='center' $col>$Lang::tr{'fwhost deleted'}</td><td align='center' $col>$customgrp{$key}[3]</td><td width='1%' $col><form method='post'>";
print "<td align='center' $col>$Lang::tr{'fwhost deleted'}</td><td align='center' $col>$Lang::tr{'fwhost '.$customgrp{$key}[3]}</td><td width='1%' $col><form method='post'>";
}else{
my ($colip,$colsub) = split("/",$ip);
$ip="$colip/".&General::iporsubtocidr($colsub) if ($colsub);
print"<td align='center' $col>".&getcolor($ip)."</td><td align='center' $col>$customgrp{$key}[3]</td><td width='1%' $col><form method='post'>";
print"<td align='center' $col>".&getcolor($ip)."</td><td align='center' $col>$Lang::tr{'fwhost '.$customgrp{$key}[3]}</td><td width='1%' $col><form method='post'>";
}
if ($delflag > 0 && $ip ne ''){
print"<input type='image' src='/images/delete.gif' align='middle' alt='$Lang::tr{'delete'}' title='$Lang::tr{'delete'}' />";
@@ -1858,8 +1855,7 @@ sub viewtablegrp
}
}
}
print"<input type='hidden' name='ACTION' value='deletegrphost'><input type='hidden' name='grpcnt' value='$customgrp{$key}[4]'><input type='hidden' name='update' value='$fwhostsettings{'update'}'><input type='hidden' name='delhost' value='$grpname,$remark,$customgrp{$key}[2],$customgrp{$key}[3]'></form></td></tr>";
print"<input type='hidden' name='ACTION' value='deletegrphost'><input type='hidden' name='update' value='$fwhostsettings{'update'}'><input type='hidden' name='delhost' value='$grpname,$remark,$customgrp{$key}[2],$customgrp{$key}[3]'></form></td></tr>";
$helper=$customgrp{$key}[0];
$number++;
}

12
langs/de/cgi-bin/de.pl
View File

@@ -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',

12
langs/en/cgi-bin/en.pl
View File

@@ -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',

4
langs/es/cgi-bin/es.pl
View File

@@ -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',

4
langs/fr/cgi-bin/fr.pl
View File

@@ -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',

4
langs/nl/cgi-bin/nl.pl
View File

@@ -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',

4
langs/pl/cgi-bin/pl.pl
View File

@@ -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',

4
langs/ru/cgi-bin/ru.pl
View File

@@ -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' => 'Расписание',

6
langs/tr/cgi-bin/tr.pl
View File

@@ -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.',