Merge branch 'master' into next

diff --git a/config/cfgroot/graphs.pl b/config/cfgroot/graphs.pl
index 1961246146dcf036df808dc4ffbc890163804b5c..5eb96d8f771721e8e9eef6163391a026859ea0e3 100644 (file)
--- 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 dca50befa6bc6e79938d0431a2cc958da6999b97..400eafa7b06c7b5a765c4e2913ea00c8b87900ca 100644 (file)
--- 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/config/rootfiles/core/50/filelists/smartmontools b/config/rootfiles/core/50/filelists/smartmontools
new file mode 120000 (symlink)
index 0000000..fb66daf
--- /dev/null
+++ b/config/rootfiles/core/50/filelists/smartmontools
@@ -0,0 +1 @@
+../../../common/smartmontools
\ No newline at end of file

diff --git a/langs/de/cgi-bin/de.pl b/langs/de/cgi-bin/de.pl
index 2c9592218ebac7b2f11b0ee0f5bc0275ece720e7..d97dee037fd4929121ad6f1055dbcb8491050c5e 100644 (file)
--- a/langs/de/cgi-bin/de.pl
+++ b/langs/de/cgi-bin/de.pl
@@ -1159,6 +1159,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 92d9f8fdabb7882683c8626b693fc91df39a6ef4..67451bef486c8e6100041052936cbac34ca99d0b 100644 (file)
--- a/langs/en/cgi-bin/en.pl
+++ b/langs/en/cgi-bin/en.pl
@@ -1186,6 +1186,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',

diff --git a/lfs/smartmontools b/lfs/smartmontools
index 5530f2108f6748a8347212028eac59c3e72b58b2..3f92cb78211a332de453b4659c4618b851a3c7a1 100644 (file)
--- a/lfs/smartmontools
+++ b/lfs/smartmontools
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007  Michael Tremer & Christian Schmidt                      #
+# Copyright (C) 2007-2011  IPFire Team  <info@ipfire.org>                     #
 #                                                                             #
 # This program is free software: you can redistribute it and/or modify        #
 # it under the terms of the GNU General Public License as published by        #
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 5.40
+VER        = 5.41
 
 THISAPP    = smartmontools-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 0f0be0239914ad87830a4fff594bda5b
+$(DL_FILE)_MD5 = 4577886bea79d4ff12bd9a7d323ce692
 
 install : $(TARGET)