diff --git a/config/rootfiles/core/42/exclude b/config/rootfiles/core/42/exclude new file mode 100644 index 000000000..e69de29bb diff --git a/config/rootfiles/core/42/filelists/files b/config/rootfiles/core/42/filelists/files new file mode 100644 index 000000000..0037af183 --- /dev/null +++ b/config/rootfiles/core/42/filelists/files @@ -0,0 +1 @@ +etc/system-release diff --git a/config/rootfiles/core/42/meta b/config/rootfiles/core/42/meta new file mode 100644 index 000000000..d547fa86f --- /dev/null +++ b/config/rootfiles/core/42/meta @@ -0,0 +1 @@ +DEPS="" diff --git a/config/rootfiles/core/42/update.sh b/config/rootfiles/core/42/update.sh new file mode 100644 index 000000000..6b54995df --- /dev/null +++ b/config/rootfiles/core/42/update.sh @@ -0,0 +1,48 @@ +#!/bin/bash +############################################################################ +# # +# This file is part of the IPFire Firewall. # +# # +# IPFire is free software; you can redistribute it and/or modify # +# it under the terms of the GNU General Public License as published by # +# the Free Software Foundation; either version 3 of the License, or # +# (at your option) any later version. # +# # +# IPFire is distributed in the hope that it will be useful, # +# but WITHOUT ANY WARRANTY; without even the implied warranty of # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # +# GNU General Public License for more details. # +# # +# You should have received a copy of the GNU General Public License # +# along with IPFire; if not, write to the Free Software # +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # +# # +# Copyright (C) 2010 IPFire-Team . # +# # +############################################################################ +# +. /opt/pakfire/lib/functions.sh +/usr/local/bin/backupctrl exclude >/dev/null 2>&1 + +# +#Stop services + +# +#Extract files +extract_files + +# +#Start services + +# +#Update Language cache +#perl -e "require '/var/ipfire/lang.pl'; &Lang::BuildCacheLang" + +#Rebuild module dep's +#depmod 2.6.32.15-ipfire +#depmod 2.6.32.15-ipfire-xen + +# +#Finish +#Don't report the exitcode last command +exit 0 diff --git a/langs/fr/cgi-bin/fr.pl b/langs/fr/cgi-bin/fr.pl index 0179e73da..70ef2149c 100644 --- a/langs/fr/cgi-bin/fr.pl +++ b/langs/fr/cgi-bin/fr.pl @@ -543,13 +543,13 @@ 'could not open update information file' => 'Impossible d\'ouvrir le fichier d\'information de mise à jour. Le fichier est corrompu.', 'could not retrieve common name from certificate' => 'Impossible de récupérer le nom courant depuis le certificat.', 'country' => 'Pays', -'cpu idle usage' => 'Utilisation du CPU', +'cpu idle usage' => 'Pourcentage d\'inactivite CPU', 'cpu interrupt usage' => 'Utilisation des interruptions CPU', 'cpu iowait usage' => 'Le COU attend des IO', 'cpu irq usage' => 'Utilisation CPU IRQ', 'cpu nice usage' => 'Utilisation CPU Nice', 'cpu steal usage' => 'Utilisation CPU Steal', -'cpu system usage' => 'Utilisation CPU Système', +'cpu system usage' => 'Utilisation CPU Systeme', 'cpu usage per' => 'Utilisation du CPU par', 'cpu user usage' => 'Utilisation du CPU par l\'utilisateur', 'create' => 'Créer', diff --git a/make.sh b/make.sh index 577a123e9..15923362a 100755 --- a/make.sh +++ b/make.sh @@ -25,8 +25,8 @@ NAME="IPFire" # Software name SNAME="ipfire" # Short name VERSION="2.8test" # Version number -CORE="41" # Core Level (Filename) -PAKFIRE_CORE="40" # Core Level (PAKFIRE) +CORE="42" # Core Level (Filename) +PAKFIRE_CORE="41" # Core Level (PAKFIRE) GIT_BRANCH=`git status | head -n1 | cut -d" " -f4` # Git Branch SLOGAN="www.ipfire.org" # Software slogan CONFIG_ROOT=/var/ipfire # Configuration rootdir