po: merge changes

Signed-off-by: Karel Zak <kzak@redhat.com>

1 files changed, 30 insertions, 25 deletions

diff --git a/po/fr.po b/po/fr.po
index 8042c6877..4c2a7fb16 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -14,7 +14,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: util-linux-ng 2.16-rc2\n"
 "Report-Msgid-Bugs-To: Karel Zak <kzak@redhat.com>\n"
-"POT-Creation-Date: 2009-11-20 15:37+0100\n"
+"POT-Creation-Date: 2009-12-09 11:32+0100\n"
 "PO-Revision-Date: 2009-07-05 22:36+0100\n"
 "Last-Translator: Nicolas Provost <nprovost@quadriv.com>\n"
 "Language-Team: French <traduc@traduc.org>\n"
@@ -5964,7 +5964,7 @@ msgid "Couldn't allocate memory for filesystem types\n"
 msgstr ""
 "Impossible d'allouer la mémoire pour les types de systèmes de fichiers\n"
 
-#: fsck/fsck.c:867
+#: fsck/fsck.c:883
 #, c-format
 msgid ""
 "%s: skipping bad line in /etc/fstab: bind mount with nonzero fsck pass "
@@ -5973,65 +5973,70 @@ msgstr ""
 "%s : mauvaise ligne dans /etc/fstab ignorée : montage avec nombre de passes "
 "\"fsck\" non nul\n"
 
-#: fsck/fsck.c:894
+#: fsck/fsck.c:893
+#, fuzzy, c-format
+msgid "%s: skipping nonexistent device\n"
+msgstr "%s: %s n'est pas un périphérique d'impression lp.\n"
+
+#: fsck/fsck.c:919
 #, c-format
 msgid "fsck: cannot check %s: fsck.%s not found\n"
 msgstr "fsck : impossible de contrôler %s, fsck.%s non trouvé\n"
 
-#: fsck/fsck.c:950
+#: fsck/fsck.c:975
 msgid "Checking all file systems.\n"
 msgstr "Contrôle de tous les systèmes de fichiers.\n"
 
-#: fsck/fsck.c:1041
+#: fsck/fsck.c:1066
 #, c-format
 msgid "--waiting-- (pass %d)\n"
 msgstr "--en attente-- (passe %d)\n"
 
-#: fsck/fsck.c:1061
+#: fsck/fsck.c:1086
 msgid ""
 "Usage: fsck [-AMNPRTV] [ -C [ fd ] ] [-t fstype] [fs-options] [filesys ...]\n"
 msgstr ""
 "Usage : fsck [-AMNPRTV] [ -C [ fd ] ] [-t type_sysfic] [options_sysfic] "
 "[sys_fic ...]\n"
 
-#: fsck/fsck.c:1099
+#: fsck/fsck.c:1124
 #, c-format
 msgid "%s: too many devices\n"
 msgstr "%s : périphériques trop nombreux\n"
 
-#: fsck/fsck.c:1110
+#: fsck/fsck.c:1135
 #, c-format
 msgid "Couldn't open %s: %s\n"
 msgstr "Impossible d'ouvrir %s : %s\n"
 
-#: fsck/fsck.c:1112
+#: fsck/fsck.c:1137
 #, c-format
 msgid "Is /proc mounted?\n"
 msgstr "/proc est-il monté ?\n"
 
-#: fsck/fsck.c:1121
+#: fsck/fsck.c:1146
 #, c-format
 msgid "Must be root to scan for matching filesystems: %s\n"
 msgstr ""
 "Vous devez être \"root\" pour rechercher le type de systèmes de fichiers : %"
 "s\n"
 
-#: fsck/fsck.c:1124
+#: fsck/fsck.c:1149
 #, c-format
 msgid "Couldn't find matching filesystem: %s\n"
 msgstr "Impossible de trouver un système de fichiers correspondant : %s\n"
 
-#: fsck/fsck.c:1132 fsck/fsck.c:1218
+#: fsck/fsck.c:1157 fsck/fsck.c:1243
 #, c-format
 msgid "%s: too many arguments\n"
 msgstr "%s : trop d'arguments\n"
 
-#: fsck/fsck.c:1252
+#: fsck/fsck.c:1277
 #, c-format
 msgid "fsck from %s\n"
 msgstr "fsck de %s\n"
 
-#: fsck/fsck.c:1264
+#: fsck/fsck.c:1289
 #, c-format
 msgid "%s: Unable to allocate memory for fsck_path\n"
 msgstr "%s : impossible d'allouer la mémoire pour fsck_path\n"
@@ -9505,7 +9510,7 @@ msgid "mount: %s already mounted on %s\n"
 msgstr "mount: %s est déjà monté sur %s\n"
 
 # mount/mount.c:1323
-#: mount/mount.c:1936
+#: mount/mount.c:1937
 #, c-format
 msgid ""
 "Usage: mount -V                 : print version\n"
@@ -9575,24 +9580,24 @@ msgstr ""
 "Autres options: [-nfFrsvw] [-o options] [-p descr_fic_mots_passe].\n"
 "Pour plus de détails, tapez \"man 8 mount\".\n"
 
-#: mount/mount.c:2261
+#: mount/mount.c:2264
 #, fuzzy, c-format
 msgid "mount: only root can do that (effective UID is %d)"
 msgstr "mount: seul l'usager ROOT peut faire cela"
 
-#: mount/mount.c:2264
+#: mount/mount.c:2267
 msgid "mount: only root can do that"
 msgstr "mount: seul l'usager ROOT peut faire cela"
 
-#: mount/mount.c:2275
+#: mount/mount.c:2278
 msgid "nothing was mounted"
 msgstr "rien n'a été monté"
 
-#: mount/mount.c:2293 mount/mount.c:2319
+#: mount/mount.c:2296 mount/mount.c:2322
 msgid "mount: no such partition found"
 msgstr "mount: pas de telle partition repérée"
 
-#: mount/mount.c:2296
+#: mount/mount.c:2299
 #, c-format
 msgid "mount: can't find %s in %s or %s"
 msgstr "mount: ne peut repérer %s dans %s ou %s"
@@ -9611,11 +9616,11 @@ msgstr "[mntent]: ligne %d dans %s est erroné%s\n"
 msgid "; rest of file ignored"
 msgstr "; reste du fichier est ignoré"
 
-#: mount/sundries.c:31
+#: mount/sundries.c:32
 msgid "bug in xstrndup call"
 msgstr "problème dans l'appel de xstrndup"
 
-#: mount/sundries.c:224 mount/sundries.c:280 mount/sundries.c:289
+#: mount/sundries.c:225 mount/sundries.c:281 mount/sundries.c:296
 #: mount/xmalloc.c:11
 msgid "not enough memory"
 msgstr "pas assez de mémoire"
@@ -10375,7 +10380,7 @@ msgid "%s: requires file descriptor, file or directory\n"
 msgstr ""
 "%s : requiert un descripteur de fichier, un fichier ou  un répertoire\n"
 
-#: sys-utils/flock.c:294
+#: sys-utils/flock.c:296
 #, c-format
 msgid "%s: fork failed: %s\n"
 msgstr "%s : échec de \"fork\" : %s\n"
@@ -12269,8 +12274,8 @@ msgid "cannot stat \"%s\""
 msgstr "impossible d'évaluer par stat() \"%s\""
 
 #: text-utils/tailf.c:109
-#, c-format
-msgid "incomplete write to \"%s\" (written %ld, expected %ld)\n"
+#, fuzzy, c-format
+msgid "incomplete write to \"%s\" (written %zd, expected %zd)\n"
 msgstr "écriture incomplète sur \"%s\" (écrits %ld, attendus %ld)\n"
 
 #: text-utils/tailf.c:147