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 4495251167fc7daafbd48016be62c2ed3b48b830 (commit) via 33a3f9501461d0b086c681411b2b8dba6fdfb8c1 (commit) from 0bdca0cecdbb3268f1e061e148bab884d8e022f9 (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 4495251167fc7daafbd48016be62c2ed3b48b830 Merge: 33a3f95 0bdca0c Author: Arne Fitzenreiter arne_f@ipfire.org Date: Fri Jan 7 09:29:26 2011 +0100

Merge branch 'master' of ssh://arne_f@git.ipfire.org/pub/git/ipfire-2.x

commit 33a3f9501461d0b086c681411b2b8dba6fdfb8c1 Author: Arne Fitzenreiter arne_f@ipfire.org Date: Fri Jan 7 09:28:13 2011 +0100

langs: Add some french strings. Fix some typos.

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

Summary of changes: langs/en/install/lang_en.c | 14 +++++++------- langs/es/install/lang_es.c | 10 +++++----- langs/fr/install/lang_fr.c | 14 +++++++------- 3 files changed, 19 insertions(+), 19 deletions(-)

Difference in files: diff --git a/langs/en/install/lang_en.c b/langs/en/install/lang_en.c index 10c35b4..4415205 100644 --- a/langs/en/install/lang_en.c +++ b/langs/en/install/lang_en.c @@ -560,25 +560,25 @@ char *en_tr[] = { /* TR_IGNORE */ "Ignore", /* TR_PPP_DIALUP */ -"PPP DIALUP (PPPoE, Modem, ATM ...)", +"PPP DIALUP (PPPoE, modem, ATM ...)", /* TR_DHCP */ "DHCP", /* TR_DHCP_STARTSERVER */ -"Starting DHCP-Server ...", +"Starting DHCP-server ...", /* TR_DHCP_STOPSERVER */ -"Stopping DHCP-Server ...", +"Stopping DHCP-server ...", /* TR_LICENSE_ACCEPT */ "I accept this license.", /* TR_LICENSE_NOT_ACCEPTED */ "License not accepted. Exit!", /* TR_EXT2FS_DESCR */ -"Ext2 - Filesystem without Journal (suggested for flashdrives)", +"Ext2 - Filesystem without journal (suggested for flashdrives)", /* TR_EXT3FS_DESCR */ -"Ext3 - Filesystem with Journal", +"Ext3 - Filesystem with journal", /* TR_EXT4FS_DESCR */ -"Ext4 - Filesystem with Journal", +"Ext4 - Filesystem with journal", /* TR_REISERFS_DESCR */ -"ReiserFS - Filesystem with Journal", +"ReiserFS - Filesystem with journal", /* TR_NO_LOCAL_SOURCE */ "No local source media found. Starting download.", /* TR_DOWNLOADING_ISO */ diff --git a/langs/es/install/lang_es.c b/langs/es/install/lang_es.c index a6ad3e9..a1808fe 100644 --- a/langs/es/install/lang_es.c +++ b/langs/es/install/lang_es.c @@ -556,7 +556,7 @@ char *es_tr[] = { /* TR_IGNORE */ "Ignorar", /* TR_PPP_DIALUP */ -"PPP DIALUP (PPPoE, Modem, ATM ...)", +"PPP DIALUP (PPPoE, modem, ATM ...)", /* TR_DHCP */ "DHCP", /* TR_DHCP_STARTSERVER */ @@ -568,13 +568,13 @@ char *es_tr[] = { /* TR_LICENSE_NOT_ACCEPTED */ "License not accepted. Exit!", /* TR_EXT2FS_DESCR */ -"Ext2 - Filesystem without Journal (suggested for flashdrives)", +"Ext2 - Filesystem without journal (suggested for flashdrives)", /* TR_EXT3FS_DESCR */ -"Ext3 - Filesystem with Journal", +"Ext3 - Filesystem with journal", /* TR_EXT4FS_DESCR */ -"Ext4 - Filesystem with Journal", +"Ext4 - Filesystem with journal", /* TR_REISERFS_DESCR */ -"ReiserFS - Filesystem with Journal", +"ReiserFS - Filesystem with journal", /* TR_NO_LOCAL_SOURCE */ "No local source media found. Starting download.", /* TR_DOWNLOADING_ISO */ diff --git a/langs/fr/install/lang_fr.c b/langs/fr/install/lang_fr.c index 7d04a72..03fa9be 100644 --- a/langs/fr/install/lang_fr.c +++ b/langs/fr/install/lang_fr.c @@ -568,19 +568,19 @@ char *fr_tr[] = { /* TR_LICENSE_NOT_ACCEPTED */ "Je n'accepte pas les termes de cette licence, quitter le programme d'installation.", /* TR_EXT2FS_DESCR */ -"Ext2 - Filesystem without Journal (suggested for flashdrives)", +"Ext2 - Système de fichiers sans journal (suggéré pour les cartes flash)", /* TR_EXT3FS_DESCR */ -"Ext3 - Filesystem with Journal", +"Ext3 - Système de fichiers avec journal", /* TR_EXT4FS_DESCR */ -"Ext4 - Filesystem with Journal", +"Ext4 - Système de fichiers avec journal", /* TR_REISERFS_DESCR */ -"ReiserFS - Filesystem with Journal", +"ReiserFS - Système de fichiers avec journal", /* TR_NO_LOCAL_SOURCE */ -"No local source media found. Starting download.", +"Pas de source locale trouvée. Démarrage du téléchargement.", /* TR_DOWNLOADING_ISO */ -"Downloading Installation-Image ...", +"Téléchargement du fichier image ISO ...", /* TR_DOWNLOAD_ERROR */ -"Error while downloading!", +"Erreur pendant le téléchargement!", /* TR_DHCP_FORCE_MTU */ "Force DHCP mtu:", };

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