This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree".

The branch, master has been updated via ad8cad552baa2561f7c8cacc52ae14242a36abfb (commit) via 1abbf741cc7985ccaf9671102af8e80dffa0846f (commit) from 2aa5f6100defbf9db5ea0cb8b4c5ce00d6cf40d8 (commit)

Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below.

- Log ----------------------------------------------------------------- commit ad8cad552baa2561f7c8cacc52ae14242a36abfb Author: Arne Fitzenreiter arne_f@ipfire.org Date: Tue Jun 28 00:48:47 2011 +0200

core50: add graphs.pl.

commit 1abbf741cc7985ccaf9671102af8e80dffa0846f Author: Arne Fitzenreiter arne_f@ipfire.org Date: Tue Jun 28 00:46:48 2011 +0200

load graph: fix unlocalized "minutes".

-----------------------------------------------------------------------

Summary of changes: config/cfgroot/graphs.pl | 6 +++--- config/rootfiles/core/50/filelists/files | 1 + langs/de/cgi-bin/de.pl | 1 + langs/en/cgi-bin/en.pl | 1 + 4 files changed, 6 insertions(+), 3 deletions(-)

Difference in files: diff --git a/config/cfgroot/graphs.pl b/config/cfgroot/graphs.pl index 1961246..5eb96d8 100644 --- a/config/cfgroot/graphs.pl +++ b/config/cfgroot/graphs.pl @@ -257,11 +257,11 @@ sub updateloadgraph { "DEF:load1=".$mainsettings{'RRDLOG'}."/collectd/localhost/load/load.rrd:shortterm:AVERAGE", "DEF:load5=".$mainsettings{'RRDLOG'}."/collectd/localhost/load/load.rrd:midterm:AVERAGE", "DEF:load15=".$mainsettings{'RRDLOG'}."/collectd/localhost/load/load.rrd:longterm:AVERAGE", - "AREA:load1".$color{"color13"}."A0:1 Minute:", + "AREA:load1".$color{"color13"}."A0:1 ".$Lang::tr{'minute'}.":", "GPRINT:load1:LAST:%5.2lf", - "AREA:load5".$color{"color18"}."A0:5 Minuten:", + "AREA:load5".$color{"color18"}."A0:5 ".$Lang::tr{'minutes'}.":", "GPRINT:load5:LAST:%5.2lf", - "AREA:load15".$color{"color14"}."A0:15 Minuten:", + "AREA:load15".$color{"color14"}."A0:15 ".$Lang::tr{'minutes'}.":", "GPRINT:load15:LAST:%5.2lf\j", "LINE1:load5".$color{"color13"}, "LINE1:load1".$color{"color18"}, diff --git a/config/rootfiles/core/50/filelists/files b/config/rootfiles/core/50/filelists/files index dca50be..400eafa 100644 --- a/config/rootfiles/core/50/filelists/files +++ b/config/rootfiles/core/50/filelists/files @@ -2,3 +2,4 @@ etc/system-release var/ipfire/langs/ etc/rc.d/init.d/console usr/local/sbin/setup +var/ipfire/graphs.pl diff --git a/langs/de/cgi-bin/de.pl b/langs/de/cgi-bin/de.pl index 09cd509..e6d451f 100644 --- a/langs/de/cgi-bin/de.pl +++ b/langs/de/cgi-bin/de.pl @@ -1150,6 +1150,7 @@ 'min delay' => 'Minimale Verzögerung', 'min size' => 'Min. Objektgröße (kB):', 'minimal' => 'Minimal', +'minute' => 'Minute', 'minutes' => 'Minuten', 'misc-options' => 'Sonstige Optionen', 'missing dat' => 'Verschlüsseltes Archiv wurde nicht gefunden', diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl index fcb9241..2478145 100644 --- a/langs/en/cgi-bin/en.pl +++ b/langs/en/cgi-bin/en.pl @@ -1177,6 +1177,7 @@ 'min delay' => 'Minimum delay', 'min size' => 'Min object size (KB):', 'minimal' => 'Minimal', +'minute' => 'Minute', 'minutes' => 'Minutes', 'misc-options' => 'Miscellaneous options', 'missing dat' => 'Encrypted archive not found',

hooks/post-receive -- IPFire 2.x development tree