Regenerate .pot files and merge .po files with them

1 files changed, 144 insertions, 100 deletions

diff --git a/dselect/po/fr.po b/dselect/po/fr.po
index 4c70ff5d4..721262fdc 100644
--- a/dselect/po/fr.po
+++ b/dselect/po/fr.po
@@ -50,7 +50,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dselect 1.17.0\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2014-08-09 12:48+0200\n"
+"POT-Creation-Date: 2014-08-15 03:51+0200\n"
 "PO-Revision-Date: 2012-07-01 08:30+0200\n"
 "Last-Translator: Christian Perrier <bubulle@debian.org>\n"
 "Language-Team: French <debian-l10n-french@lists.debian.org>\n"
@@ -128,53 +128,53 @@ msgstr "impossible de bloquer SIGWINCH"
 msgid "failed to set new SIGWINCH sigact"
 msgstr "impossible de positionner le nouveau sigact de SIGWINCH"
 
-#: dselect/baselist.cc:136
+#: dselect/baselist.cc:174
 msgid "failed to allocate colour pair"
 msgstr "impossible d'allouer une paire de couleurs"
 
-#: dselect/baselist.cc:165
+#: dselect/baselist.cc:203
 msgid "failed to create title window"
 msgstr "impossible de créer la fenêtre de titre"
 
-#: dselect/baselist.cc:169
+#: dselect/baselist.cc:207
 msgid "failed to create whatinfo window"
 msgstr "impossible de créer la fenêtre d'à propos"
 
-#: dselect/baselist.cc:173
+#: dselect/baselist.cc:211
 msgid "failed to create baselist pad"
 msgstr "impossible de créer la zone de liste de base"
 
-#: dselect/baselist.cc:176
+#: dselect/baselist.cc:214
 msgid "failed to create heading pad"
 msgstr "impossible de créer la zone d'en-tête"
 
-#: dselect/baselist.cc:180
+#: dselect/baselist.cc:218
 msgid "failed to create thisstate pad"
 msgstr "impossible de créer la zone d'état"
 
-#: dselect/baselist.cc:184
+#: dselect/baselist.cc:222
 msgid "failed to create info pad"
 msgstr "impossible de créer la zone d'info"
 
-#: dselect/baselist.cc:189
+#: dselect/baselist.cc:227
 msgid "failed to create query window"
 msgstr "impossible de créer la fenêtre de requête"
 
-#: dselect/baselist.cc:258
+#: dselect/baselist.cc:298
 msgid "Keybindings"
 msgstr "Affectations de touches"
 
-#: dselect/baselist.cc:307
+#: dselect/baselist.cc:347
 #, c-format
 msgid "  -- %d%%, press "
 msgstr "  -- %d%%, appuyez sur "
 
-#: dselect/baselist.cc:310
+#: dselect/baselist.cc:350
 #, c-format
 msgid "%s for more"
 msgstr "%s pour plus d'informations"
 
-#: dselect/baselist.cc:314
+#: dselect/baselist.cc:354
 #, c-format
 msgid "%s to go back"
 msgstr "%s pour revenir en arrière"
@@ -325,6 +325,38 @@ msgid "Keystrokes"
 msgstr "Combinaisons de touches"
 
 #: dselect/helpmsgs.cc:29
+#, fuzzy
+#| msgid ""
+#| "Motion keys: Next/Previous, Top/End, Up/Down, Backwards/Forwards:\n"
+#| "  j, Down-arrow         k, Up-arrow             move highlight\n"
+#| "  N, Page-down, Space   P, Page-up, Backspace   scroll list by 1 page\n"
+#| "  ^n                    ^p                      scroll list by 1 line\n"
+#| "  t, Home               e, End                  jump to top/end of list\n"
+#| "  u                     d                       scroll info by 1 page\n"
+#| "  ^u                    ^d                      scroll info by 1 line\n"
+#| "  B, Left-arrow         F, Right-arrow          pan display by 1/3 "
+#| "screen\n"
+#| "  ^b                    ^f                      pan display by 1 "
+#| "character\n"
+#| "\n"
+#| "Mark packages for later processing:\n"
+#| " +, Insert  install or upgrade      =, H  hold in present state\n"
+#| " -, Delete  remove                  :, G  unhold: upgrade or leave "
+#| "uninstalled\n"
+#| " _          remove & purge config\n"
+#| "                                             Miscellaneous:\n"
+#| "Quit, exit, overwrite (note capitals!):       ?, F1 request help (also "
+#| "Help)\n"
+#| " Return  Confirm, quit (check dependencies)   i, I  toggle/cycle info "
+#| "displays\n"
+#| "   Q     Confirm, quit (override dep.s)       o, O  cycle through sort "
+#| "options\n"
+#| " X, Esc  eXit, abandoning any changes made    v, V  change status display "
+#| "opts\n"
+#| "   R     Revert to state before this list      ^l   redraw display\n"
+#| "   U     set all to sUggested state             /   search (Return to "
+#| "cancel)\n"
+#| "   D     set all to Directly requested state  n, \\  repeat last search\n"
 msgid ""
 "Motion keys: Next/Previous, Top/End, Up/Down, Backwards/Forwards:\n"
 "  j, Down-arrow         k, Up-arrow             move highlight\n"
@@ -348,7 +380,7 @@ msgid ""
 "displays\n"
 "   Q     Confirm, quit (override dep.s)       o, O  cycle through sort "
 "options\n"
-" X, Esc  eXit, abandoning any changes made    v, V  change status display "
+" X, Esc  eXit, abandoning any changes made   v, A, V  change status display "
 "opts\n"
 "   R     Revert to state before this list      ^l   redraw display\n"
 "   U     set all to sUggested state             /   search (Return to "
@@ -974,36 +1006,36 @@ msgstr "Attributs :\n"
 msgid "couldn't open debug file `%.255s'\n"
 msgstr "impossible d'ouvrir le fichier de débogage « %.255s »\n"
 
-#: dselect/main.cc:254
+#: dselect/main.cc:253
 #, c-format
 msgid "invalid %s '%s'"
 msgstr "Non valable %s « %s »"
 
-#: dselect/main.cc:273
+#: dselect/main.cc:272
 msgid "screen part"
 msgstr "Partie de l'écran"
 
-#: dselect/main.cc:279
+#: dselect/main.cc:278
 msgid "null colour specification"
 msgstr "Spécification de couleur nulle"
 
-#: dselect/main.cc:287 dselect/main.cc:292
+#: dselect/main.cc:286 dselect/main.cc:291
 msgid "colour"
 msgstr "couleur"
 
-#: dselect/main.cc:300
+#: dselect/main.cc:299
 msgid "colour attribute"
 msgstr "attribut de couleur"
 
-#: dselect/main.cc:334
+#: dselect/main.cc:333
 msgid "Terminal does not appear to support cursor addressing.\n"
 msgstr "Il semble que votre terminal ne supporte pas la gestion du curseur\n"
 
-#: dselect/main.cc:336
+#: dselect/main.cc:335
 msgid "Terminal does not appear to support highlighting.\n"
 msgstr "Il semble que votre terminal ne supporte pas le surlignage\n"
 
-#: dselect/main.cc:338
+#: dselect/main.cc:337
 #, c-format
 msgid ""
 "Set your TERM variable correctly, use a better terminal,\n"
@@ -1013,11 +1045,11 @@ msgstr ""
 "un meilleur terminal ou contentez-vous d'une installation\n"
 "paquet par paquet avec l'outil de gestion de paquets %s.\n"
 
-#: dselect/main.cc:341
+#: dselect/main.cc:340
 msgid "terminal lacks necessary features, giving up"
 msgstr "Il manque d'importantes fonctionnalités au terminal, abandon"
 
-#: dselect/main.cc:426
+#: dselect/main.cc:425
 msgid ""
 "\n"
 "\n"
@@ -1032,7 +1064,7 @@ msgstr ""
 "Appuyez sur <Entrée> pour confirmer la sélection. ^L pour redessiner "
 "l'écran.\n"
 
-#: dselect/main.cc:431
+#: dselect/main.cc:430
 msgid ""
 "Copyright (C) 1994-1996 Ian Jackson.\n"
 "Copyright (C) 2000,2001 Wichert Akkerman.\n"
@@ -1040,7 +1072,7 @@ msgstr ""
 "Copyright (C) 1994-1996 Ian Jackson.\n"
 "Copyright (C) 2000,2001 Wichert Akkerman.\n"
 
-#: dselect/main.cc:437
+#: dselect/main.cc:436
 msgid ""
 "\n"
 "\n"
@@ -1050,15 +1082,23 @@ msgstr ""
 "\n"
 "Accès en lecture seule : seul un aperçu des sélections est disponible !"
 
-#: dselect/main.cc:456
+#: dselect/main.cc:455
 msgid "failed to getch in main menu"
 msgstr "échec de « getch » dans le menu principal"
 
-#: dselect/main.cc:539
+#: dselect/main.cc:538
 #, c-format
 msgid "unknown action string `%.50s'"
 msgstr "chaîne d'action inconnue « %.50s »"
 
+#: dselect/methlist.cc:66
+msgid "Abbrev."
+msgstr "Abrév."
+
+#: dselect/methlist.cc:67 dselect/pkgdisplay.cc:188 dselect/pkginfo.cc:110
+msgid "Description"
+msgstr "Description"
+
 #: dselect/methlist.cc:73
 msgid "dselect - list of access methods"
 msgstr "dselect - liste des méthodes d'accès"
@@ -1068,35 +1108,27 @@ msgstr "dselect - liste des méthodes d'accès"
 msgid "Access method `%s'."
 msgstr "Méthode d'accès « %s »."
 
-#: dselect/methlist.cc:116
-msgid "Abbrev."
-msgstr "Abrév."
-
-#: dselect/methlist.cc:117 dselect/pkginfo.cc:110 dselect/pkgtop.cc:293
-msgid "Description"
-msgstr "Description"
-
-#: dselect/methlist.cc:160 dselect/pkglist.cc:585
+#: dselect/methlist.cc:161 dselect/pkglist.cc:587
 msgid "doupdate failed"
 msgstr "échec de doupdate"
 
-#: dselect/methlist.cc:163 dselect/pkglist.cc:588
+#: dselect/methlist.cc:164 dselect/pkglist.cc:590
 msgid "failed to unblock SIGWINCH"
 msgstr "échec du déblocage de SIGWINCH"
 
-#: dselect/methlist.cc:168 dselect/pkglist.cc:593
+#: dselect/methlist.cc:169 dselect/pkglist.cc:595
 msgid "failed to re-block SIGWINCH"
 msgstr "échec du reblocage de SIGWINCH"
 
-#: dselect/methlist.cc:169 dselect/pkglist.cc:595
+#: dselect/methlist.cc:170 dselect/pkglist.cc:597
 msgid "getch failed"
 msgstr "échec de « getch »"
 
-#: dselect/methlist.cc:186
+#: dselect/methlist.cc:187
 msgid "Explanation"
 msgstr "Explication"
 
-#: dselect/methlist.cc:196
+#: dselect/methlist.cc:197
 msgid "No explanation available."
 msgstr "Aucune explication n'est disponible."
 
@@ -1497,67 +1529,119 @@ msgstr "Installé"
 msgid "Purged"
 msgstr "Purgé"
 
-#: dselect/pkgdisplay.cc:193
+#: dselect/pkgdisplay.cc:138
+msgid "Error"
+msgstr "Erreur"
+
+#: dselect/pkgdisplay.cc:139
+msgid "Installed?"
+msgstr "Installé ?"
+
+#: dselect/pkgdisplay.cc:140
+msgid "Old mark"
+msgstr "Ancienne marque"
+
+#: dselect/pkgdisplay.cc:141
+msgid "Marked for"
+msgstr "Marqué pour"
+
+#: dselect/pkgdisplay.cc:143
+msgid "EIOM"
+msgstr "EIAM"
+
+#: dselect/pkgdisplay.cc:147 dselect/pkgdisplay.cc:150
+msgid "Section"
+msgstr "Section"
+
+#: dselect/pkgdisplay.cc:148
+msgid "Priority"
+msgstr "Priorité"
+
+#: dselect/pkgdisplay.cc:152
+msgid "Package"
+msgstr "Paquet"
+
+#: dselect/pkgdisplay.cc:161 dselect/pkgdisplay.cc:165
+#, fuzzy
+#| msgid "Avail.ver"
+msgid "Avail.arch"
+msgstr "Vers. dispo."
+
+#: dselect/pkgdisplay.cc:164
+#, fuzzy
+#| msgid "Inst.ver"
+msgid "Inst.arch"
+msgstr "Vers. inst"
+
+#: dselect/pkgdisplay.cc:178 dselect/pkgdisplay.cc:182
+msgid "Avail.ver"
+msgstr "Vers. dispo."
+
+#: dselect/pkgdisplay.cc:181
+msgid "Inst.ver"
+msgstr "Vers. inst"
+
+#: dselect/pkgdisplay.cc:197
 msgid "dselect - recursive package listing"
 msgstr "dselect - liste des paquets récursive"
 
-#: dselect/pkgdisplay.cc:195
+#: dselect/pkgdisplay.cc:199
 msgid "dselect - inspection of package states"
 msgstr "dselect - inspection de l'état des paquets"
 
-#: dselect/pkgdisplay.cc:196
+#: dselect/pkgdisplay.cc:200
 msgid "dselect - main package listing"
 msgstr "dselect - liste principale des paquets"
 
-#: dselect/pkgdisplay.cc:204
+#: dselect/pkgdisplay.cc:208
 msgid " (by section)"
 msgstr " (par section)"
 
-#: dselect/pkgdisplay.cc:207
+#: dselect/pkgdisplay.cc:211
 msgid " (avail., section)"
 msgstr " (dispo., section)"
 
-#: dselect/pkgdisplay.cc:210
+#: dselect/pkgdisplay.cc:214
 msgid " (status, section)"
 msgstr " (état, section)"
 
-#: dselect/pkgdisplay.cc:219
+#: dselect/pkgdisplay.cc:223
 msgid " (by priority)"
 msgstr " (par priorité)"
 
-#: dselect/pkgdisplay.cc:222
+#: dselect/pkgdisplay.cc:226
 msgid " (avail., priority)"
 msgstr " (dispo., priorité)"
 
-#: dselect/pkgdisplay.cc:225
+#: dselect/pkgdisplay.cc:229
 msgid " (status, priority)"
 msgstr " (état, priorité)"
 
-#: dselect/pkgdisplay.cc:234
+#: dselect/pkgdisplay.cc:238
 msgid " (alphabetically)"
 msgstr " (alphabétiquement)"
 
-#: dselect/pkgdisplay.cc:237
+#: dselect/pkgdisplay.cc:241
 msgid " (by availability)"
 msgstr " (par disponibilité)"
 
-#: dselect/pkgdisplay.cc:240
+#: dselect/pkgdisplay.cc:244
 msgid " (by status)"
 msgstr " (par état)"
 
-#: dselect/pkgdisplay.cc:255
+#: dselect/pkgdisplay.cc:259
 msgid " mark:+/=/- terse:v help:?"
 msgstr " marq:+/=/- concis:v aide:?"
 
-#: dselect/pkgdisplay.cc:256
+#: dselect/pkgdisplay.cc:260
 msgid " mark:+/=/- verbose:v help:?"
 msgstr " marq:+/=/- verbeux:v aide:?"
 
-#: dselect/pkgdisplay.cc:258
+#: dselect/pkgdisplay.cc:262
 msgid " terse:v help:?"
 msgstr " concis:v aide:?"
 
-#: dselect/pkgdisplay.cc:259
+#: dselect/pkgdisplay.cc:263
 msgid " verbose:v help:?"
 msgstr " verbeux:v aide:?"
 
@@ -1602,11 +1686,11 @@ msgstr "Informations disponibles du fichier de contrôle"
 msgid "there are no packages"
 msgstr "Il n'existe pas de paquets"
 
-#: dselect/pkglist.cc:519
+#: dselect/pkglist.cc:521
 msgid "invalid search option given"
 msgstr "Option de recherche donnée invalide"
 
-#: dselect/pkglist.cc:534
+#: dselect/pkglist.cc:536
 msgid "error in regular expression"
 msgstr "Erreur dans l'expression rationnelle"
 
@@ -1656,46 +1740,6 @@ msgstr "Paquets %s %s dans la section %s"
 msgid "%-*s %s%s%s;  %s (was: %s).  %s"
 msgstr "%-*s %s%s%s ;  %s (précédemment : %s).  %s"
 
-#: dselect/pkgtop.cc:265
-msgid "Error"
-msgstr "Erreur"
-
-#: dselect/pkgtop.cc:269
-msgid "Installed?"
-msgstr "Installé ?"
-
-#: dselect/pkgtop.cc:273
-msgid "Old mark"
-msgstr "Ancienne marque"
-
-#: dselect/pkgtop.cc:277
-msgid "Marked for"
-msgstr "Marqué pour"
-
-#: dselect/pkgtop.cc:280
-msgid "EIOM"
-msgstr "EIAM"
-
-#: dselect/pkgtop.cc:282
-msgid "Section"
-msgstr "Section"
-
-#: dselect/pkgtop.cc:283
-msgid "Priority"
-msgstr "Priorité"
-
-#: dselect/pkgtop.cc:284
-msgid "Package"
-msgstr "Paquet"
-
-#: dselect/pkgtop.cc:288
-msgid "Inst.ver"
-msgstr "Vers. inst"
-
-#: dselect/pkgtop.cc:291
-msgid "Avail.ver"
-msgstr "Vers. dispo."
-
 #~ msgid "foreign architectures enabled but multi-arch is not supported"
 #~ msgstr ""
 #~ "les architectures étrangères sont activées mais les fonctionnalités multi-"