Regenerate .pot files and merge .po files with them

1 files changed, 59 insertions, 49 deletions

diff --git a/dselect/po/fr.po b/dselect/po/fr.po
index 5284f78ca..360f38f03 100644
--- a/dselect/po/fr.po
+++ b/dselect/po/fr.po
@@ -50,7 +50,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2012-03-19 07:23+0100\n"
+"POT-Creation-Date: 2012-04-27 10:06+0200\n"
 "PO-Revision-Date: 2012-03-23 07:40+0100\n"
 "Last-Translator: Christian Perrier <bubulle@debian.org>\n"
 "Language-Team: French <debian-l10n-french@lists.debian.org>\n"
@@ -65,25 +65,25 @@ msgstr ""
 msgid "Search for ? "
 msgstr "Rechercher ?"
 
-#: dselect/basecmds.cc:147
+#: dselect/basecmds.cc:149
 msgid "Error: "
 msgstr "Erreur : "
 
-#: dselect/basecmds.cc:178
+#: dselect/basecmds.cc:180
 msgid "Help: "
 msgstr "Aide : "
 
-#: dselect/basecmds.cc:184
+#: dselect/basecmds.cc:186
 msgid "Press ? for help menu, . for next topic, <space> to exit help."
 msgstr ""
 "Appuyez sur ? pour un menu d'aide, . pour le sujet suivant, <espace>\n"
 "pour quitter l'aide."
 
-#: dselect/basecmds.cc:191
+#: dselect/basecmds.cc:193
 msgid "Help information is available under the following topics:"
 msgstr "L'information d'aide est accessible au travers des thèmes suivants :"
 
-#: dselect/basecmds.cc:199
+#: dselect/basecmds.cc:201
 msgid ""
 "Press a key from the list above, <space> or `q' to exit help,\n"
 "  or `.' (full stop) to read each help page in turn. "
@@ -92,7 +92,7 @@ msgstr ""
 "  <espace> ou « q » pour sortir de l'aide,\n"
 "  ou . pour lire chaque page tour à tour. "
 
-#: dselect/basecmds.cc:205
+#: dselect/basecmds.cc:207
 msgid "error reading keyboard in help"
 msgstr "erreur de lecture du clavier dans l'aide"
 
@@ -132,49 +132,49 @@ msgstr "impossible de positionner le nouveau sigact de SIGWINCH"
 msgid "failed to allocate colour pair"
 msgstr "impossible d'allouer une paire de couleurs"
 
-#: dselect/baselist.cc:167
+#: dselect/baselist.cc:155
 msgid "failed to create title window"
 msgstr "impossible de créer la fenêtre de titre"
 
-#: dselect/baselist.cc:171
+#: dselect/baselist.cc:159
 msgid "failed to create whatinfo window"
 msgstr "impossible de créer la fenêtre d'à propos"
 
-#: dselect/baselist.cc:175
+#: dselect/baselist.cc:163
 msgid "failed to create baselist pad"
 msgstr "impossible de créer la zone de liste de base"
 
-#: dselect/baselist.cc:178
+#: dselect/baselist.cc:166
 msgid "failed to create heading pad"
 msgstr "impossible de créer la zone d'en-tête"
 
-#: dselect/baselist.cc:182
+#: dselect/baselist.cc:170
 msgid "failed to create thisstate pad"
 msgstr "impossible de créer la zone d'état"
 
-#: dselect/baselist.cc:186
+#: dselect/baselist.cc:174
 msgid "failed to create info pad"
 msgstr "impossible de créer la zone d'info"
 
-#: dselect/baselist.cc:191
+#: dselect/baselist.cc:179
 msgid "failed to create query window"
 msgstr "impossible de créer la fenêtre de requête"
 
-#: dselect/baselist.cc:255
+#: dselect/baselist.cc:247
 msgid "Keybindings"
 msgstr "Affectations de touches"
 
-#: dselect/baselist.cc:303
+#: dselect/baselist.cc:295
 #, c-format
 msgid "  -- %d%%, press "
 msgstr "  -- %d%%, appuyez sur "
 
-#: dselect/baselist.cc:306
+#: dselect/baselist.cc:298
 #, c-format
 msgid "%s for more"
 msgstr "%s pour plus d'informations"
 
-#: dselect/baselist.cc:310
+#: dselect/baselist.cc:302
 #, c-format
 msgid "%s to go back"
 msgstr "%s pour revenir en arrière"
@@ -917,13 +917,23 @@ msgstr ""
 "\n"
 
 #: dselect/main.cc:185
-#, c-format
+#, fuzzy, c-format
+#| msgid ""
+#| "Options:\n"
+#| "  --admindir <directory>     Use <directory> instead of %s.\n"
+#| "  --expert                   Turn on expert mode.\n"
+#| "  --debug <file> | -D<file>  Turn on debugging, sending output to "
+#| "<file>.\n"
+#| "  --colour | --color screenpart:[foreground],[background][:attr[+attr"
+#| "+..]]\n"
+#| "                             Configure screen colours.\n"
+#| "\n"
 msgid ""
 "Options:\n"
 "  --admindir <directory>     Use <directory> instead of %s.\n"
 "  --expert                   Turn on expert mode.\n"
 "  --debug <file> | -D<file>  Turn on debugging, sending output to <file>.\n"
-"  --colour | --color screenpart:[foreground],[background][:attr[+attr+..]]\n"
+"  --colour | --color screenpart:[foreground],[background][:attr[+attr+...]]\n"
 "                             Configure screen colours.\n"
 "\n"
 msgstr ""
@@ -1026,8 +1036,8 @@ msgstr "Il manque d'importantes fonctionnalités au terminal, abandon"
 #: dselect/main.cc:369
 msgid "foreign architectures enabled but multi-arch is not supported"
 msgstr ""
-"les architectures étrangères sont activées mais les fonctionnalités "
-"multi-architectures ne sont pas gérées"
+"les architectures étrangères sont activées mais les fonctionnalités multi-"
+"architectures ne sont pas gérées"
 
 #: dselect/main.cc:422
 msgid ""
@@ -1066,49 +1076,49 @@ msgstr ""
 msgid "failed to getch in main menu"
 msgstr "échec de « getch » dans le menu principal"
 
-#: dselect/main.cc:536
+#: dselect/main.cc:539
 #, c-format
 msgid "unknown action string `%.50s'"
 msgstr "chaîne d'action inconnue « %.50s »"
 
-#: dselect/methlist.cc:77
+#: dselect/methlist.cc:72
 msgid "dselect - list of access methods"
 msgstr "dselect - liste des méthodes d'accès"
 
-#: dselect/methlist.cc:86
+#: dselect/methlist.cc:81
 #, c-format
 msgid "Access method `%s'."
 msgstr "Méthode d'accès « %s »."
 
-#: dselect/methlist.cc:120
+#: dselect/methlist.cc:115
 msgid "Abbrev."
 msgstr "Abrév."
 
-#: dselect/methlist.cc:121 dselect/pkginfo.cc:105 dselect/pkgtop.cc:291
+#: dselect/methlist.cc:116 dselect/pkginfo.cc:105 dselect/pkgtop.cc:291
 msgid "Description"
 msgstr "Description"
 
-#: dselect/methlist.cc:164 dselect/pkglist.cc:577
+#: dselect/methlist.cc:159 dselect/pkglist.cc:577
 msgid "doupdate failed"
 msgstr "échec de doupdate"
 
-#: dselect/methlist.cc:166 dselect/pkglist.cc:580
+#: dselect/methlist.cc:161 dselect/pkglist.cc:580
 msgid "failed to unblock SIGWINCH"
 msgstr "échec du déblocage de SIGWINCH"
 
-#: dselect/methlist.cc:170 dselect/pkglist.cc:585
+#: dselect/methlist.cc:165 dselect/pkglist.cc:585
 msgid "failed to re-block SIGWINCH"
 msgstr "échec du reblocage de SIGWINCH"
 
-#: dselect/methlist.cc:171 dselect/pkglist.cc:587
+#: dselect/methlist.cc:166 dselect/pkglist.cc:587
 msgid "getch failed"
 msgstr "échec de « getch »"
 
-#: dselect/methlist.cc:188
+#: dselect/methlist.cc:183
 msgid "Explanation"
 msgstr "Explication"
 
-#: dselect/methlist.cc:197
+#: dselect/methlist.cc:192
 msgid "No explanation available."
 msgstr "Aucune explication n'est disponible."
 
@@ -1509,67 +1519,67 @@ msgstr "Installé"
 msgid "Purged"
 msgstr "Purgé"
 
-#: dselect/pkgdisplay.cc:198
+#: dselect/pkgdisplay.cc:193
 msgid "dselect - recursive package listing"
 msgstr "dselect - liste des paquets récursive"
 
-#: dselect/pkgdisplay.cc:200
+#: dselect/pkgdisplay.cc:195
 msgid "dselect - inspection of package states"
 msgstr "dselect - inspection de l'état des paquets"
 
-#: dselect/pkgdisplay.cc:201
+#: dselect/pkgdisplay.cc:196
 msgid "dselect - main package listing"
 msgstr "dselect - liste principale des paquets"
 
-#: dselect/pkgdisplay.cc:209
+#: dselect/pkgdisplay.cc:204
 msgid " (by section)"
 msgstr " (par section)"
 
-#: dselect/pkgdisplay.cc:212
+#: dselect/pkgdisplay.cc:207
 msgid " (avail., section)"
 msgstr " (dispo., section)"
 
-#: dselect/pkgdisplay.cc:215
+#: dselect/pkgdisplay.cc:210
 msgid " (status, section)"
 msgstr " (état, section)"
 
-#: dselect/pkgdisplay.cc:224
+#: dselect/pkgdisplay.cc:219
 msgid " (by priority)"
 msgstr " (par priorité)"
 
-#: dselect/pkgdisplay.cc:227
+#: dselect/pkgdisplay.cc:222
 msgid " (avail., priority)"
 msgstr " (dispo., priorité)"
 
-#: dselect/pkgdisplay.cc:230
+#: dselect/pkgdisplay.cc:225
 msgid " (status, priority)"
 msgstr " (état, priorité)"
 
-#: dselect/pkgdisplay.cc:239
+#: dselect/pkgdisplay.cc:234
 msgid " (alphabetically)"
 msgstr " (alphabétiquement)"
 
-#: dselect/pkgdisplay.cc:242
+#: dselect/pkgdisplay.cc:237
 msgid " (by availability)"
 msgstr " (par disponibilité)"
 
-#: dselect/pkgdisplay.cc:245
+#: dselect/pkgdisplay.cc:240
 msgid " (by status)"
 msgstr " (par état)"
 
-#: dselect/pkgdisplay.cc:260
+#: dselect/pkgdisplay.cc:255
 msgid " mark:+/=/- terse:v help:?"
 msgstr " marq:+/=/- concis:v aide:?"
 
-#: dselect/pkgdisplay.cc:261
+#: dselect/pkgdisplay.cc:256
 msgid " mark:+/=/- verbose:v help:?"
 msgstr " marq:+/=/- verbeux:v aide:?"
 
-#: dselect/pkgdisplay.cc:263
+#: dselect/pkgdisplay.cc:258
 msgid " terse:v help:?"
 msgstr " concis:v aide:?"
 
-#: dselect/pkgdisplay.cc:264
+#: dselect/pkgdisplay.cc:259
 msgid " verbose:v help:?"
 msgstr " verbeux:v aide:?"