Regenerate .pot files and merge .po files with them

1 files changed, 144 insertions, 100 deletions

diff --git a/dselect/po/nl.po b/dselect/po/nl.po
index 709173455..41bedd61c 100644
--- a/dselect/po/nl.po
+++ b/dselect/po/nl.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dselect 1.16.1.2\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: 2011-12-12 11:55+0100\n"
 "Last-Translator: Jeroen Schot <schot@a-eskwadraat.nl>\n"
 "Language-Team: Dutch <debian-l10n-dutch@lists.debian.org>\n"
@@ -84,53 +84,53 @@ msgstr "kon SIGWINCH niet blokkeren"
 msgid "failed to set new SIGWINCH sigact"
 msgstr "kon nieuwe SIGWINCH actie niet instellen"
 
-#: dselect/baselist.cc:136
+#: dselect/baselist.cc:174
 msgid "failed to allocate colour pair"
 msgstr "kon kleurparen niet reserveren"
 
-#: dselect/baselist.cc:165
+#: dselect/baselist.cc:203
 msgid "failed to create title window"
 msgstr "kon titelvenster niet aanmaken"
 
-#: dselect/baselist.cc:169
+#: dselect/baselist.cc:207
 msgid "failed to create whatinfo window"
 msgstr "kon whatinfo venster niet aanmaken"
 
-#: dselect/baselist.cc:173
+#: dselect/baselist.cc:211
 msgid "failed to create baselist pad"
 msgstr "kon lijstgebied niet aanmaken"
 
-#: dselect/baselist.cc:176
+#: dselect/baselist.cc:214
 msgid "failed to create heading pad"
 msgstr "kon kopgebied niet aanmaken"
 
-#: dselect/baselist.cc:180
+#: dselect/baselist.cc:218
 msgid "failed to create thisstate pad"
 msgstr "kon statusgebied niet aanmaken"
 
-#: dselect/baselist.cc:184
+#: dselect/baselist.cc:222
 msgid "failed to create info pad"
 msgstr "kon infogebied niet aanmaken"
 
-#: dselect/baselist.cc:189
+#: dselect/baselist.cc:227
 msgid "failed to create query window"
 msgstr "kon vragenvenster niet aanmaken"
 
-#: dselect/baselist.cc:258
+#: dselect/baselist.cc:298
 msgid "Keybindings"
 msgstr "Toetsbindingen"
 
-#: dselect/baselist.cc:307
+#: dselect/baselist.cc:347
 #, c-format
 msgid "  -- %d%%, press "
 msgstr "  -- %d%%, druk op "
 
-#: dselect/baselist.cc:310
+#: dselect/baselist.cc:350
 #, c-format
 msgid "%s for more"
 msgstr "%s voor meer"
 
-#: dselect/baselist.cc:314
+#: dselect/baselist.cc:354
 #, c-format
 msgid "%s to go back"
 msgstr "%s om terug te gaan"
@@ -283,6 +283,38 @@ msgid "Keystrokes"
 msgstr "Toetsen"
 
 #: 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"
@@ -306,7 +338,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 "
@@ -929,39 +961,39 @@ msgstr "Attributes:\n"
 msgid "couldn't open debug file `%.255s'\n"
 msgstr "kon debugbestand `%.255s' niet openen\n"
 
-#: dselect/main.cc:254
+#: dselect/main.cc:253
 #, fuzzy, c-format
 #| msgid "Invalid %s `%s'\n"
 msgid "invalid %s '%s'"
 msgstr "Ongeldige %s '%s'\n"
 
-#: dselect/main.cc:273
+#: dselect/main.cc:272
 msgid "screen part"
 msgstr "schermdeel"
 
-#: dselect/main.cc:279
+#: dselect/main.cc:278
 #, fuzzy
 #| msgid "Null colour specification\n"
 msgid "null colour specification"
 msgstr "Blanco-kleur specificatie\n"
 
-#: dselect/main.cc:287 dselect/main.cc:292
+#: dselect/main.cc:286 dselect/main.cc:291
 msgid "colour"
 msgstr "kleur"
 
-#: dselect/main.cc:300
+#: dselect/main.cc:299
 msgid "colour attribute"
 msgstr "kleurattribuut"
 
-#: dselect/main.cc:334
+#: dselect/main.cc:333
 msgid "Terminal does not appear to support cursor addressing.\n"
 msgstr "Terminal lijkt de cursor niet te kunnen besturen.\n"
 
-#: dselect/main.cc:336
+#: dselect/main.cc:335
 msgid "Terminal does not appear to support highlighting.\n"
 msgstr "Terminal lijkt oplichten niet te ondersteunen.\n"
 
-#: dselect/main.cc:338
+#: dselect/main.cc:337
 #, c-format
 msgid ""
 "Set your TERM variable correctly, use a better terminal,\n"
@@ -970,11 +1002,11 @@ msgstr ""
 "Zet uw TERM variabele goed, gebruik een betere terminal,\n"
 "of doe het met de per-pakket-beheertool %s.\n"
 
-#: dselect/main.cc:341
+#: dselect/main.cc:340
 msgid "terminal lacks necessary features, giving up"
 msgstr "terminal kan essentiële ... niet aan, er wordt opgegeven"
 
-#: dselect/main.cc:426
+#: dselect/main.cc:425
 msgid ""
 "\n"
 "\n"
@@ -988,7 +1020,7 @@ msgstr ""
 "Druk op <enter> om selectie te activeren.  ^L tekent het scherm opnieuw.\n"
 "\n"
 
-#: dselect/main.cc:431
+#: dselect/main.cc:430
 msgid ""
 "Copyright (C) 1994-1996 Ian Jackson.\n"
 "Copyright (C) 2000,2001 Wichert Akkerman.\n"
@@ -996,7 +1028,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"
@@ -1006,15 +1038,23 @@ msgstr ""
 "\n"
 "Toegang is alleen lezen: de selecties worden niet bewaard!"
 
-#: dselect/main.cc:456
+#: dselect/main.cc:455
 msgid "failed to getch in main menu"
 msgstr "getch in hoofdmenu is mislukt"
 
-#: dselect/main.cc:539
+#: dselect/main.cc:538
 #, c-format
 msgid "unknown action string `%.50s'"
 msgstr "onbekend actiewoord `%.50s'"
 
+#: dselect/methlist.cc:66
+msgid "Abbrev."
+msgstr "Afkorting"
+
+#: dselect/methlist.cc:67 dselect/pkgdisplay.cc:188 dselect/pkginfo.cc:110
+msgid "Description"
+msgstr "Omschrijving"
+
 #: dselect/methlist.cc:73
 msgid "dselect - list of access methods"
 msgstr "dselect - lijst van toegangsmethoden"
@@ -1024,35 +1064,27 @@ msgstr "dselect - lijst van toegangsmethoden"
 msgid "Access method `%s'."
 msgstr "Toegangsmethode `%s'."
 
-#: dselect/methlist.cc:116
-msgid "Abbrev."
-msgstr "Afkorting"
-
-#: dselect/methlist.cc:117 dselect/pkginfo.cc:110 dselect/pkgtop.cc:293
-msgid "Description"
-msgstr "Omschrijving"
-
-#: dselect/methlist.cc:160 dselect/pkglist.cc:585
+#: dselect/methlist.cc:161 dselect/pkglist.cc:587
 msgid "doupdate failed"
 msgstr "doupdate is mislukt"
 
-#: dselect/methlist.cc:163 dselect/pkglist.cc:588
+#: dselect/methlist.cc:164 dselect/pkglist.cc:590
 msgid "failed to unblock SIGWINCH"
 msgstr "kon SIGWINCH niet deblokkeren"
 
-#: dselect/methlist.cc:168 dselect/pkglist.cc:593
+#: dselect/methlist.cc:169 dselect/pkglist.cc:595
 msgid "failed to re-block SIGWINCH"
 msgstr "kon SIGWINCH niet opnieuw blokkeren"
 
-#: dselect/methlist.cc:169 dselect/pkglist.cc:595
+#: dselect/methlist.cc:170 dselect/pkglist.cc:597
 msgid "getch failed"
 msgstr "getch is mislukt"
 
-#: dselect/methlist.cc:186
+#: dselect/methlist.cc:187
 msgid "Explanation"
 msgstr "Verklaring"
 
-#: dselect/methlist.cc:196
+#: dselect/methlist.cc:197
 msgid "No explanation available."
 msgstr "Geen uitleg beschikbaar."
 
@@ -1441,67 +1473,119 @@ msgstr "Geïnstalleerde"
 msgid "Purged"
 msgstr "Gewist"
 
-#: dselect/pkgdisplay.cc:193
+#: dselect/pkgdisplay.cc:138
+msgid "Error"
+msgstr "Fout"
+
+#: dselect/pkgdisplay.cc:139
+msgid "Installed?"
+msgstr "Geïnstalleerd?"
+
+#: dselect/pkgdisplay.cc:140
+msgid "Old mark"
+msgstr "Huidig"
+
+#: dselect/pkgdisplay.cc:141
+msgid "Marked for"
+msgstr "Gewenst"
+
+#: dselect/pkgdisplay.cc:143
+msgid "EIOM"
+msgstr "EIOM"
+
+#: dselect/pkgdisplay.cc:147 dselect/pkgdisplay.cc:150
+msgid "Section"
+msgstr "Sectie"
+
+#: dselect/pkgdisplay.cc:148
+msgid "Priority"
+msgstr "Voorrang"
+
+#: dselect/pkgdisplay.cc:152
+msgid "Package"
+msgstr "Pakket"
+
+#: dselect/pkgdisplay.cc:161 dselect/pkgdisplay.cc:165
+#, fuzzy
+#| msgid "Avail.ver"
+msgid "Avail.arch"
+msgstr "Besch.ver"
+
+#: dselect/pkgdisplay.cc:164
+#, fuzzy
+#| msgid "Inst.ver"
+msgid "Inst.arch"
+msgstr "Geïnst.ver"
+
+#: dselect/pkgdisplay.cc:178 dselect/pkgdisplay.cc:182
+msgid "Avail.ver"
+msgstr "Besch.ver"
+
+#: dselect/pkgdisplay.cc:181
+msgid "Inst.ver"
+msgstr "Geïnst.ver"
+
+#: dselect/pkgdisplay.cc:197
 msgid "dselect - recursive package listing"
 msgstr "dselect - recursieve pakkettenlijst"
 
-#: dselect/pkgdisplay.cc:195
+#: dselect/pkgdisplay.cc:199
 msgid "dselect - inspection of package states"
 msgstr "dselect - bekijken pakketstatus"
 
-#: dselect/pkgdisplay.cc:196
+#: dselect/pkgdisplay.cc:200
 msgid "dselect - main package listing"
 msgstr "dselect - hoofdpakkettenlijst"
 
-#: dselect/pkgdisplay.cc:204
+#: dselect/pkgdisplay.cc:208
 msgid " (by section)"
 msgstr " (op sectie)"
 
-#: dselect/pkgdisplay.cc:207
+#: dselect/pkgdisplay.cc:211
 msgid " (avail., section)"
 msgstr " (besch., sectie)"
 
-#: dselect/pkgdisplay.cc:210
+#: dselect/pkgdisplay.cc:214
 msgid " (status, section)"
 msgstr " (status, sectie)"
 
-#: dselect/pkgdisplay.cc:219
+#: dselect/pkgdisplay.cc:223
 msgid " (by priority)"
 msgstr " (op prioriteit)"
 
-#: dselect/pkgdisplay.cc:222
+#: dselect/pkgdisplay.cc:226
 msgid " (avail., priority)"
 msgstr " (besch., prioriteit)"
 
-#: dselect/pkgdisplay.cc:225
+#: dselect/pkgdisplay.cc:229
 msgid " (status, priority)"
 msgstr " (status, prioriteit)"
 
-#: dselect/pkgdisplay.cc:234
+#: dselect/pkgdisplay.cc:238
 msgid " (alphabetically)"
 msgstr " (alfabetisch)"
 
-#: dselect/pkgdisplay.cc:237
+#: dselect/pkgdisplay.cc:241
 msgid " (by availability)"
 msgstr " (op beschikbaarheid)"
 
-#: dselect/pkgdisplay.cc:240
+#: dselect/pkgdisplay.cc:244
 msgid " (by status)"
 msgstr " (op status)"
 
-#: dselect/pkgdisplay.cc:255
+#: dselect/pkgdisplay.cc:259
 msgid " mark:+/=/- terse:v help:?"
 msgstr " markeer:+/=/- kort:v hulp:?"
 
-#: dselect/pkgdisplay.cc:256
+#: dselect/pkgdisplay.cc:260
 msgid " mark:+/=/- verbose:v help:?"
 msgstr " markeer:+/=/- lang:v hulp:?"
 
-#: dselect/pkgdisplay.cc:258
+#: dselect/pkgdisplay.cc:262
 msgid " terse:v help:?"
 msgstr " kort:v hulp:?"
 
-#: dselect/pkgdisplay.cc:259
+#: dselect/pkgdisplay.cc:263
 msgid " verbose:v help:?"
 msgstr " lang:v hulp:?"
 
@@ -1548,11 +1632,11 @@ msgstr "Beschikbare informatie uit 'control'-bestanden"
 msgid "there are no packages"
 msgstr "Er zijn geen pakketten."
 
-#: dselect/pkglist.cc:519
+#: dselect/pkglist.cc:521
 msgid "invalid search option given"
 msgstr "ongeldige zoekoptie opgegeven"
 
-#: dselect/pkglist.cc:534
+#: dselect/pkglist.cc:536
 msgid "error in regular expression"
 msgstr "fout in reguliere expressie"
 
@@ -1602,46 +1686,6 @@ msgstr "%s %s pakketten in sectie %s"
 msgid "%-*s %s%s%s;  %s (was: %s).  %s"
 msgstr "%-*s %s%s%s;  %s (was: %s).  %s"
 
-#: dselect/pkgtop.cc:265
-msgid "Error"
-msgstr "Fout"
-
-#: dselect/pkgtop.cc:269
-msgid "Installed?"
-msgstr "Geïnstalleerd?"
-
-#: dselect/pkgtop.cc:273
-msgid "Old mark"
-msgstr "Huidig"
-
-#: dselect/pkgtop.cc:277
-msgid "Marked for"
-msgstr "Gewenst"
-
-#: dselect/pkgtop.cc:280
-msgid "EIOM"
-msgstr "EIOM"
-
-#: dselect/pkgtop.cc:282
-msgid "Section"
-msgstr "Sectie"
-
-#: dselect/pkgtop.cc:283
-msgid "Priority"
-msgstr "Voorrang"
-
-#: dselect/pkgtop.cc:284
-msgid "Package"
-msgstr "Pakket"
-
-#: dselect/pkgtop.cc:288
-msgid "Inst.ver"
-msgstr "Geïnst.ver"
-
-#: dselect/pkgtop.cc:291
-msgid "Avail.ver"
-msgstr "Besch.ver"
-
 #~ msgid ""
 #~ "Actions:\n"
 #~ "  access update select install config remove quit\n"