webadmin/bpfire
1
0
Fork 0
mirror of https://github.com/vincentmli/bpfire.git synced 2026-04-10 02:55:55 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge commit 'origin/master' into next

Browse Source 
Conflicts:
	make.sh
This commit is contained in:
Arne Fitzenreiter
2010-10-30 21:37:44 +02:00
parent 933377600e 4b8ede3119
commit 57e682114e
6 changed files with 54 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

0
config/rootfiles/core/42/exclude Normal file
View File

1
config/rootfiles/core/42/filelists/files Normal file
View File

@@ -0,0 +1 @@
etc/system-release

1
config/rootfiles/core/42/meta Normal file
View File

@@ -0,0 +1 @@
DEPS=""

48
config/rootfiles/core/42/update.sh Normal file
View File

@@ -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 <info@ipfire.org>. #
# #
############################################################################
#
. /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

4
langs/fr/cgi-bin/fr.pl
View File

@@ -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',

4
make.sh
View File

@@ -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