po: Regenerate .pot files and merge .po files with them

1 files changed, 32 insertions, 21 deletions

diff --git a/po/fr.po b/po/fr.po
index 3e2e0220b..a84e118ac 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dpkg 1.17.0\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2016-05-02 04:18+0200\n"
+"POT-Creation-Date: 2016-05-09 03:21+0200\n"
 "PO-Revision-Date: 2015-09-08 10:18+0200\n"
 "Last-Translator: Sébastien Poher <sbphr@volted.net>\n"
 "Language-Team: French <debian-l10n-french@lists.debian.org>\n"
@@ -483,40 +483,35 @@ msgstr ""
 msgid "failed to write %s database record about '%.50s' to '%.250s'"
 msgstr "échec de l'écriture de %s enregistrements de « %.50s » à « %.250s »"
 
-#: lib/dpkg/ehandle.c
-#, c-format
-msgid ""
-"%s: unrecoverable fatal error, aborting:\n"
-" %s\n"
-msgstr ""
-"%s : erreur fatale irréversible, abandon :\n"
-" %s\n"
+#: lib/dpkg/ehandle.c utils/update-alternatives.c
+msgid "error"
+msgstr "erreur"
 
 #: lib/dpkg/ehandle.c
 #, c-format
 msgid ""
-"%s: outside error context, aborting:\n"
+"%s%s%s: %s%s:%s\n"
 " %s\n"
 msgstr ""
-"%s : hors du contexte d'erreur, abandon :\n"
-" %s\n"
 
 #: lib/dpkg/ehandle.c
 msgid "out of memory for new error context"
 msgstr "manque de mémoire pour un nouveau contexte d'erreur"
 
 #: lib/dpkg/ehandle.c
-#, c-format
-msgid ""
-"%s: error while cleaning up:\n"
-" %s\n"
+#, fuzzy
+#| msgid ""
+#| "%s: error while cleaning up:\n"
+#| " %s\n"
+msgid "error while cleaning up"
 msgstr ""
 "%s : erreur lors du nettoyage :\n"
 " %s\n"
 
 #: lib/dpkg/ehandle.c
-#, c-format
-msgid "%s: too many nested errors during error recovery!!\n"
+#, fuzzy
+#| msgid "%s: too many nested errors during error recovery!!\n"
+msgid "too many nested errors during error recovery"
 msgstr "%s : trop d'erreurs imbriquées lors d'une réparation.\n"
 
 #: lib/dpkg/ehandle.c
@@ -529,9 +524,25 @@ msgstr ""
 "manque de mémoire pour une nouvelle entrée nettoyée avec beaucoup de "
 "paramètres"
 
-#: lib/dpkg/ehandle.c utils/update-alternatives.c
-msgid "error"
-msgstr "erreur"
+#: lib/dpkg/ehandle.c
+#, fuzzy
+#| msgid ""
+#| "%s: unrecoverable fatal error, aborting:\n"
+#| " %s\n"
+msgid "unrecoverable fatal error, aborting"
+msgstr ""
+"%s : erreur fatale irréversible, abandon :\n"
+" %s\n"
+
+#: lib/dpkg/ehandle.c
+#, fuzzy
+#| msgid ""
+#| "%s: outside error context, aborting:\n"
+#| " %s\n"
+msgid "outside error context, aborting"
+msgstr ""
+"%s : hors du contexte d'erreur, abandon :\n"
+" %s\n"
 
 #: lib/dpkg/ehandle.c
 #, fuzzy