From: Michael Tremer Date: Mon, 17 Feb 2014 15:28:23 +0000 (+0100) Subject: Merge remote-tracking branch 'alfh/feature_langfixes' into next X-Git-Url: http://git.ipfire.org/?p=people%2Fteissler%2Fipfire-2.x.git;a=commitdiff_plain;h=6d3c8250fe1e6ef297d01bcc7a19672adfff70e6;hp=bd4db4708547cafea8ca2a13d35b6b15bd3b40fa Merge remote-tracking branch 'alfh/feature_langfixes' into next --- diff --git a/config/cfgroot/graphs.pl b/config/cfgroot/graphs.pl index a0df5c07d..5a45ec964 100644 --- a/config/cfgroot/graphs.pl +++ b/config/cfgroot/graphs.pl @@ -990,9 +990,9 @@ sub updateqosgraph { push(@command, "DEF:$classline[1]=$mainsettings{'RRDLOG'}/class_$qossettings{'CLASSPRFX'}-$classline[1]_$qossettings{'DEV'}.rrd:bytes:AVERAGE"); if ($count eq "1") { - push(@command, "AREA:$classline[1]$color:Klasse $classline[1] -".sprintf("%15s",$classline[8])); + push(@command, "AREA:$classline[1]$color:$Lang::tr{'Class'} $classline[1] -".sprintf("%15s",$classline[8])); } else { - push(@command, "STACK:$classline[1]$color:Klasse $classline[1] -".sprintf("%15s",$classline[8])); + push(@command, "STACK:$classline[1]$color:$Lang::tr{'Class'} $classline[1] -".sprintf("%15s",$classline[8])); } diff --git a/html/cgi-bin/country.cgi b/html/cgi-bin/country.cgi index 476a680f4..db6c07496 100644 --- a/html/cgi-bin/country.cgi +++ b/html/cgi-bin/country.cgi @@ -43,11 +43,11 @@ require "${General::swroot}/header.pl"; print ""; print ""; print ""; -print ""; +print ""; print ""; print ""; print ""; -print ""; +print ""; @flaglist = <$flagdir/*>; diff --git a/html/cgi-bin/index.cgi b/html/cgi-bin/index.cgi index a497607f1..14eceac00 100644 --- a/html/cgi-bin/index.cgi +++ b/html/cgi-bin/index.cgi @@ -177,7 +177,7 @@ END my $HOSTNAME = (gethostbyaddr(pack("C4", split(/\./, $ipaddr)), 2))[0]; if ( "$HOSTNAME" ne "" ) { print < + END } @@ -187,7 +187,7 @@ END chomp($GATEWAY); close TMP; print < + END } #Read DNS server 1 diff --git a/html/cgi-bin/logs.cgi/firewalllog.dat b/html/cgi-bin/logs.cgi/firewalllog.dat index 75340881d..8bb490063 100644 --- a/html/cgi-bin/logs.cgi/firewalllog.dat +++ b/html/cgi-bin/logs.cgi/firewalllog.dat @@ -317,7 +317,7 @@ print <$Lang::tr{'proto'} - + END diff --git a/html/cgi-bin/logs.cgi/firewalllogip.dat b/html/cgi-bin/logs.cgi/firewalllogip.dat index b58f09e75..8f07661a7 100644 --- a/html/cgi-bin/logs.cgi/firewalllogip.dat +++ b/html/cgi-bin/logs.cgi/firewalllogip.dat @@ -406,10 +406,10 @@ print < - - + + - + END ; diff --git a/html/cgi-bin/logs.cgi/firewalllogport.dat b/html/cgi-bin/logs.cgi/firewalllogport.dat index 7a32a906f..b27f6ede7 100644 --- a/html/cgi-bin/logs.cgi/firewalllogport.dat +++ b/html/cgi-bin/logs.cgi/firewalllogport.dat @@ -409,9 +409,9 @@ print < - + - + END ; diff --git a/html/cgi-bin/media.cgi b/html/cgi-bin/media.cgi index 52d9337eb..6dc2b9c85 100644 --- a/html/cgi-bin/media.cgi +++ b/html/cgi-bin/media.cgi @@ -152,7 +152,7 @@ END for(my $i = 1; $i <= $#iostat1; $i++){ if ( $i eq '1' ){ - print ""; + print ""; }else{ print ""; } @@ -206,7 +206,7 @@ sub diskbox { if ( $status[1]=~/standby/){ my $ftime = localtime((stat("/var/run/hddshutdown-$disk"))[9]); - print"Disk $disk status:".$status[1]." (since $ftime)"; + print"Disk $disk status:".$status[1]." ($Lang::tr{'since'} $ftime)"; }else{ print"Disk $disk status:".$status[1].""; } diff --git a/html/cgi-bin/ovpnmain.cgi b/html/cgi-bin/ovpnmain.cgi index 8858974a0..a86abb44e 100644 --- a/html/cgi-bin/ovpnmain.cgi +++ b/html/cgi-bin/ovpnmain.cgi @@ -2350,12 +2350,12 @@ print < - + - + @@ -2787,7 +2787,7 @@ if ( -s "${General::swroot}/ovpn/settings") { - + diff --git a/html/cgi-bin/qos.cgi b/html/cgi-bin/qos.cgi index b0b6006ab..8b96731dd 100644 --- a/html/cgi-bin/qos.cgi +++ b/html/cgi-bin/qos.cgi @@ -796,7 +796,7 @@ sub changedefclasses {
FlagCodeCountry$Lang::tr{'country'} FlagCodeCountry
$Lang::tr{'country'}
Hostname:$HOSTNAME
$Lang::tr{'hostname'}:$HOSTNAMEGateway:$GATEWAY
$Lang::tr{'gateway'}:$GATEWAY
$Lang::tr{'source'}
$Lang::tr{'destination'}		 $Lang::tr{'src port'}
$Lang::tr{'dst port'}		Flag$Lang::tr{'country'} $Lang::tr{'mac address'}
IPFlag$Lang::tr{'ip address'}$Lang::tr{'country'} CountPercent$Lang::tr{'percentage'}
Port$Lang::tr{'port'} CountPercent$Lang::tr{'percentage'}
DeviceMB readMB writen
$Lang::tr{'device'}MB readMB writen
$iostat1[$i]$iostat2[$i]$iostat3[$i]
fragment
Default: 1300$Lang::tr{'openvpn default'}: 1300
mssfix Default: on$Lang::tr{'openvpn default'}: on
$Lang::tr{'net to net vpn'} (Upload Client Package)
 
 Import Connection Name
 Default : Client Packagename
 $Lang::tr{'openvpn default'}: Client Packagename
* $Lang::tr{'this field may be blank'}
$Lang::tr{'no filter pass'} -
Download:
$Lang::tr{'download'}:  -
Upload:
$Lang::tr{'upload'}: