From: Michael Tremer Date: Wed, 26 Mar 2014 22:35:18 +0000 (+0100) Subject: Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next X-Git-Url: http://git.ipfire.org/?p=people%2Fteissler%2Fipfire-2.x.git;a=commitdiff_plain;h=7add463e51039d0409545f7279d43a66eba1d532;hp=513c321ebedcf0865863b95ccd453f155f7703ed Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next --- diff --git a/doc/language_issues.de b/doc/language_issues.de index d501b712e..a7d894055 100644 --- a/doc/language_issues.de +++ b/doc/language_issues.de @@ -4,6 +4,7 @@ WARNING: translation string unused: ConnSched select profile WARNING: translation string unused: HDD temperature WARNING: translation string unused: Level7 rule WARNING: translation string unused: Local VPN IP +WARNING: translation string unused: MB written WARNING: translation string unused: Ping WARNING: translation string unused: Queuelenght WARNING: translation string unused: Remote IP diff --git a/doc/language_issues.en b/doc/language_issues.en index 494780f25..26c8d3280 100644 --- a/doc/language_issues.en +++ b/doc/language_issues.en @@ -4,6 +4,7 @@ WARNING: translation string unused: ConnSched select profile WARNING: translation string unused: HDD temperature WARNING: translation string unused: Level7 rule WARNING: translation string unused: Local VPN IP +WARNING: translation string unused: MB written WARNING: translation string unused: Ping WARNING: translation string unused: Queuelenght WARNING: translation string unused: Remote IP diff --git a/doc/language_issues.es b/doc/language_issues.es index cf2fe5282..ab8dea730 100644 --- a/doc/language_issues.es +++ b/doc/language_issues.es @@ -572,6 +572,7 @@ WARNING: translation string unused: xtaccess bad transfert WARNING: translation string unused: year-graph WARNING: translation string unused: yearly firewallhits WARNING: untranslated string: Async logging enabled +WARNING: untranslated string: MB read WARNING: untranslated string: Scan for Songs WARNING: untranslated string: Set time on boot WARNING: untranslated string: addons diff --git a/doc/language_issues.fr b/doc/language_issues.fr index b3d9252be..7085978c7 100644 --- a/doc/language_issues.fr +++ b/doc/language_issues.fr @@ -583,6 +583,7 @@ WARNING: translation string unused: xtaccess all error WARNING: translation string unused: xtaccess bad transfert WARNING: translation string unused: year-graph WARNING: translation string unused: yearly firewallhits +WARNING: untranslated string: MB read WARNING: untranslated string: Scan for Songs WARNING: untranslated string: addons WARNING: untranslated string: advproxy cache-digest diff --git a/doc/language_issues.nl b/doc/language_issues.nl index 9b20840e4..695bcc01f 100644 --- a/doc/language_issues.nl +++ b/doc/language_issues.nl @@ -587,6 +587,7 @@ WARNING: translation string unused: xtaccess all error WARNING: translation string unused: xtaccess bad transfert WARNING: translation string unused: year-graph WARNING: translation string unused: yearly firewallhits +WARNING: untranslated string: MB read WARNING: untranslated string: Scan for Songs WARNING: untranslated string: addons WARNING: untranslated string: advproxy cache-digest diff --git a/doc/language_issues.pl b/doc/language_issues.pl index cf2fe5282..ab8dea730 100644 --- a/doc/language_issues.pl +++ b/doc/language_issues.pl @@ -572,6 +572,7 @@ WARNING: translation string unused: xtaccess bad transfert WARNING: translation string unused: year-graph WARNING: translation string unused: yearly firewallhits WARNING: untranslated string: Async logging enabled +WARNING: untranslated string: MB read WARNING: untranslated string: Scan for Songs WARNING: untranslated string: Set time on boot WARNING: untranslated string: addons diff --git a/doc/language_issues.ru b/doc/language_issues.ru index 0c94fc64a..f7ee8449c 100644 --- a/doc/language_issues.ru +++ b/doc/language_issues.ru @@ -576,6 +576,7 @@ WARNING: translation string unused: xtaccess bad transfert WARNING: translation string unused: yearly firewallhits WARNING: untranslated string: Add a route WARNING: untranslated string: Edit an existing route +WARNING: untranslated string: MB read WARNING: untranslated string: Scan for Songs WARNING: untranslated string: addons WARNING: untranslated string: advproxy cache-digest diff --git a/doc/language_issues.tr b/doc/language_issues.tr index c2665104d..f7c94029d 100644 --- a/doc/language_issues.tr +++ b/doc/language_issues.tr @@ -637,6 +637,7 @@ WARNING: translation string unused: xtaccess all error WARNING: translation string unused: xtaccess bad transfert WARNING: translation string unused: year-graph WARNING: translation string unused: yearly firewallhits +WARNING: untranslated string: MB read WARNING: untranslated string: Scan for Songs WARNING: untranslated string: bytes WARNING: untranslated string: ccd err isipsecrw diff --git a/doc/language_missings b/doc/language_missings index 3c3d74207..5530615ba 100644 --- a/doc/language_missings +++ b/doc/language_missings @@ -301,6 +301,8 @@ < lifetime < mac filter < maximum +< MB read +< MB written < minimum < minute < most preferred @@ -760,6 +762,8 @@ < lifetime < mac filter < maximum +< MB read +< MB written < minimum < minute < most preferred @@ -1203,6 +1207,8 @@ < lifetime < mac filter < maximum +< MB read +< MB written < minimum < minute < most preferred @@ -1637,6 +1643,8 @@ < lifetime < mac filter < maximum +< MB read +< MB written < minimum < minute < month-graph diff --git a/html/cgi-bin/media.cgi b/html/cgi-bin/media.cgi index 2aec3cce1..9dea789f3 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 "$Lang::tr{'device'}MB readMB writen"; + print "$Lang::tr{'device'}$Lang::tr{'MB read'}$Lang::{'MB writen'}"; }else{ print "$iostat1[$i]$iostat2[$i]$iostat3[$i]"; } diff --git a/langs/de/cgi-bin/de.pl b/langs/de/cgi-bin/de.pl index 267d1751d..977dbacb4 100644 --- a/langs/de/cgi-bin/de.pl +++ b/langs/de/cgi-bin/de.pl @@ -33,6 +33,8 @@ 'Level7 Rule' => 'Level7-Regel', 'Level7 rule' => 'Level7-Regel', 'Local VPN IP' => 'Internes Netzwerk (GREEN)', +'MB read' => 'MB gelesen', +'MB written' => 'MB geschrieben', 'MTU' => 'MTU Size', 'Number of IPs for the pie chart' => 'Anzahl der angezeigten IPs im Diagramm', 'Number of Ports for the pie chart' => 'Anzahl der angezeigten Ports im Diagramm', diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl index 64b6d19bb..42dea0e53 100644 --- a/langs/en/cgi-bin/en.pl +++ b/langs/en/cgi-bin/en.pl @@ -33,6 +33,8 @@ 'Level7 Rule' => 'Level7-Rule', 'Level7 rule' => 'Level7 rule', 'Local VPN IP' => 'Internal Network (GREEN):', +'MB read' => 'MB read', +'MB written' => 'MB written', 'MTU' => 'MTU size:', 'Number of IPs for the pie chart' => 'Number of IPs for the pie chart', 'Number of Ports for the pie chart' => 'Number of ports for the pie chart',