Regenerate .pot files and merge .po files with them

1 files changed, 94 insertions, 96 deletions

diff --git a/dselect/po/nl.po b/dselect/po/nl.po
index 571a733a3..965086d7d 100644
--- a/dselect/po/nl.po
+++ b/dselect/po/nl.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dpkg/deselect 1.16.1.2\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2011-11-25 11:21+0100\n"
+"POT-Creation-Date: 2012-03-19 07:23+0100\n"
 "PO-Revision-Date: 2011-12-12 11:55+0100\n"
 "Last-Translator: Jeroen Schot <schot@a-eskwadraat.nl>\n"
 "Language-Team: Debian l10n Dutch <debian-l10n-dutch@lists.debian.org>\n"
@@ -742,112 +742,104 @@ msgstr ""
 "  /                   zoeken (alleen enter voor annuleren)\n"
 "  \\                  laatste zoekopdracht herhalen\n"
 
-#: dselect/main.cc:60
+#: dselect/main.cc:64
 msgid "Type dselect --help for help."
 msgstr "Type dselect --help voor hulp."
 
-#: dselect/main.cc:143
+#: dselect/main.cc:146
 msgid "a"
 msgstr "t"
 
-#: dselect/main.cc:143
+#: dselect/main.cc:146
 msgid "[A]ccess"
 msgstr "[T]oegang"
 
-#: dselect/main.cc:143
+#: dselect/main.cc:146
 msgid "Choose the access method to use."
 msgstr "Kies een toegangsmethode."
 
-#: dselect/main.cc:144
+#: dselect/main.cc:147
 msgid "u"
 msgstr "b"
 
-#: dselect/main.cc:144
+#: dselect/main.cc:147
 msgid "[U]pdate"
 msgstr "[B]ijwerken"
 
-#: dselect/main.cc:144
+#: dselect/main.cc:147
 msgid "Update list of available packages, if possible."
 msgstr "Werk de lijst met pakketten bij, indien mogelijk."
 
-#: dselect/main.cc:145
+#: dselect/main.cc:148
 msgid "s"
 msgstr "s"
 
-#: dselect/main.cc:145
+#: dselect/main.cc:148
 msgid "[S]elect"
 msgstr "[S]electeer"
 
-#: dselect/main.cc:145
+#: dselect/main.cc:148
 msgid "Request which packages you want on your system."
 msgstr "Vertel welke pakketten u op uw systeem wilt."
 
-#: dselect/main.cc:146
+#: dselect/main.cc:149
 msgid "i"
 msgstr "i"
 
-#: dselect/main.cc:146
+#: dselect/main.cc:149
 msgid "[I]nstall"
 msgstr "[I]nstalleren"
 
-#: dselect/main.cc:146
+#: dselect/main.cc:149
 msgid "Install and upgrade wanted packages."
 msgstr "Installeer pakketten of werk gewenste pakketten bij."
 
-#: dselect/main.cc:147
+#: dselect/main.cc:150
 msgid "c"
 msgstr "c"
 
-#: dselect/main.cc:147
+#: dselect/main.cc:150
 msgid "[C]onfig"
 msgstr "[C]onfigureren"
 
-#: dselect/main.cc:147
+#: dselect/main.cc:150
 msgid "Configure any packages that are unconfigured."
 msgstr "Configureer pakketten die nog niet geconfigureerd zijn."
 
-#: dselect/main.cc:148
+#: dselect/main.cc:151
 msgid "r"
 msgstr "v"
 
-#: dselect/main.cc:148
+#: dselect/main.cc:151
 msgid "[R]emove"
 msgstr "[V]erwijderen"
 
-#: dselect/main.cc:148
+#: dselect/main.cc:151
 msgid "Remove unwanted software."
 msgstr "Verwijder ongewenste programmatuur."
 
-#: dselect/main.cc:149
+#: dselect/main.cc:152
 msgid "q"
 msgstr "e"
 
-#: dselect/main.cc:149
+#: dselect/main.cc:152
 msgid "[Q]uit"
 msgstr "[E]inde"
 
-#: dselect/main.cc:149
+#: dselect/main.cc:152
 msgid "Quit dselect."
 msgstr "dselect afsluiten."
 
-#: dselect/main.cc:150
+#: dselect/main.cc:153
 msgid "menu"
 msgstr "menu"
 
-#: dselect/main.cc:155
+#: dselect/main.cc:158
 #, c-format
 msgid "Debian `%s' package handling frontend version %s.\n"
 msgstr "Debian `%s' pakketbeheer-frontend versie %s.\n"
 
-#: dselect/main.cc:158
-msgid ""
-"Copyright (C) 1994-1996 Ian Jackson.\n"
-"Copyright (C) 2000,2001 Wichert Akkerman.\n"
-msgstr ""
-"Copyright (C) 1994-1996 Ian Jackson.\n"
-"Copyright (C) 2000,2001 Wichert Akkerman.\n"
-
-#: dselect/main.cc:162
+#: dselect/main.cc:161
 msgid ""
 "This is free software; see the GNU General Public License version 2 or\n"
 "later for copying conditions. There is NO warranty.\n"
@@ -855,11 +847,11 @@ msgstr ""
 "Dit is vrije programmatuur; zie de GNU General Public License versie 2\n"
 "of later voor kopiëervoorwaarden. Er is GEEN garantie.\n"
 
-#: dselect/main.cc:172 dselect/main.cc:220
+#: dselect/main.cc:170 dselect/main.cc:218
 msgid "<standard output>"
 msgstr "<standaard uitvoer>"
 
-#: dselect/main.cc:183
+#: dselect/main.cc:181
 #, c-format
 msgid ""
 "Usage: %s [<option> ...] [<action> ...]\n"
@@ -868,7 +860,7 @@ msgstr ""
 "Gebruik: %s [<optie> ...] [<actie> ...]\n"
 "\n"
 
-#: dselect/main.cc:187
+#: dselect/main.cc:185
 #, c-format
 msgid ""
 "Options:\n"
@@ -888,7 +880,7 @@ msgstr ""
 "                                     Stel schermkleuren in.\n"
 "\n"
 
-#: dselect/main.cc:196
+#: dselect/main.cc:194
 #, c-format
 msgid ""
 "  --help                     Show this help message.\n"
@@ -899,7 +891,7 @@ msgstr ""
 "  --version                  Toon de versie.\n"
 "\n"
 
-#: dselect/main.cc:201
+#: dselect/main.cc:199
 #, c-format
 msgid ""
 "Actions:\n"
@@ -910,56 +902,56 @@ msgstr ""
 "  access update select install config remove quit\n"
 "\n"
 
-#: dselect/main.cc:205
+#: dselect/main.cc:203
 #, c-format
 msgid "Screenparts:\n"
 msgstr "Schermdelen:\n"
 
-#: dselect/main.cc:210
+#: dselect/main.cc:208
 #, c-format
 msgid "Colours:\n"
 msgstr "Kleuren:\n"
 
-#: dselect/main.cc:215
+#: dselect/main.cc:213
 #, c-format
 msgid "Attributes:\n"
 msgstr "Attributes:\n"
 
-#: dselect/main.cc:233
+#: dselect/main.cc:231
 #, c-format
 msgid "couldn't open debug file `%.255s'\n"
 msgstr "kon debugbestand `%.255s' niet openen\n"
 
-#: dselect/main.cc:253
+#: dselect/main.cc:251
 #, c-format
 msgid "Invalid %s `%s'\n"
 msgstr "Ongeldige %s '%s'\n"
 
-#: dselect/main.cc:270
+#: dselect/main.cc:268
 msgid "screen part"
 msgstr "schermdeel"
 
-#: dselect/main.cc:276
+#: dselect/main.cc:274
 msgid "Null colour specification\n"
 msgstr "Blanco-kleur specificatie\n"
 
-#: dselect/main.cc:284 dselect/main.cc:289
+#: dselect/main.cc:282 dselect/main.cc:287
 msgid "colour"
 msgstr "kleur"
 
-#: dselect/main.cc:297
+#: dselect/main.cc:295
 msgid "colour attribute"
 msgstr "kleurattribuut"
 
-#: dselect/main.cc:329
+#: dselect/main.cc:327
 msgid "Terminal does not appear to support cursor addressing.\n"
 msgstr "Terminal lijkt de cursor niet te kunnen besturen.\n"
 
-#: dselect/main.cc:331
+#: dselect/main.cc:329
 msgid "Terminal does not appear to support highlighting.\n"
 msgstr "Terminal lijkt oplichten niet te ondersteunen.\n"
 
-#: dselect/main.cc:333
+#: dselect/main.cc:331
 #, c-format
 msgid ""
 "Set your TERM variable correctly, use a better terminal,\n"
@@ -968,11 +960,15 @@ msgstr ""
 "Zet uw TERM variabele goed, gebruik een betere terminal,\n"
 "of doe het met de per-pakket-beheertool %s.\n"
 
-#: dselect/main.cc:336
+#: dselect/main.cc:334
 msgid "terminal lacks necessary features, giving up"
 msgstr "terminal kan essentiële ... niet aan, er wordt opgegeven"
 
-#: dselect/main.cc:417
+#: dselect/main.cc:369
+msgid "foreign architectures enabled but multi-arch is not supported"
+msgstr ""
+
+#: dselect/main.cc:422
 msgid ""
 "\n"
 "\n"
@@ -986,7 +982,15 @@ msgstr ""
 "Druk op <enter> om selectie te activeren.  ^L tekent het scherm opnieuw.\n"
 "\n"
 
-#: dselect/main.cc:428
+#: dselect/main.cc:427
+msgid ""
+"Copyright (C) 1994-1996 Ian Jackson.\n"
+"Copyright (C) 2000,2001 Wichert Akkerman.\n"
+msgstr ""
+"Copyright (C) 1994-1996 Ian Jackson.\n"
+"Copyright (C) 2000,2001 Wichert Akkerman.\n"
+
+#: dselect/main.cc:433
 msgid ""
 "\n"
 "\n"
@@ -996,11 +1000,11 @@ msgstr ""
 "\n"
 "Toegang is alleen lezen: de selecties worden niet bewaard!"
 
-#: dselect/main.cc:448
+#: dselect/main.cc:453
 msgid "failed to getch in main menu"
 msgstr "getch in hoofdmenu is mislukt"
 
-#: dselect/main.cc:531
+#: dselect/main.cc:536
 #, c-format
 msgid "unknown action string `%.50s'"
 msgstr "onbekend actiewoord `%.50s'"
@@ -1022,19 +1026,19 @@ msgstr "Afkorting"
 msgid "Description"
 msgstr "Omschrijving"
 
-#: dselect/methlist.cc:164 dselect/pkglist.cc:572
+#: dselect/methlist.cc:164 dselect/pkglist.cc:577
 msgid "doupdate failed"
 msgstr "doupdate is mislukt"
 
-#: dselect/methlist.cc:166 dselect/pkglist.cc:575
+#: dselect/methlist.cc:166 dselect/pkglist.cc:580
 msgid "failed to unblock SIGWINCH"
 msgstr "kon SIGWINCH niet deblokkeren"
 
-#: dselect/methlist.cc:170 dselect/pkglist.cc:580
+#: dselect/methlist.cc:170 dselect/pkglist.cc:585
 msgid "failed to re-block SIGWINCH"
 msgstr "kon SIGWINCH niet opnieuw blokkeren"
 
-#: dselect/methlist.cc:171 dselect/pkglist.cc:582
+#: dselect/methlist.cc:171 dselect/pkglist.cc:587
 msgid "getch failed"
 msgstr "getch is mislukt"
 
@@ -1194,26 +1198,11 @@ msgstr "fout bij lezen van bestand met methodenopties `%.250s'"
 msgid "unable to open current option file `%.250s'"
 msgstr "kon huidig optiebestand `%.250s' niet openen"
 
-#: dselect/methparse.cc:289
-#, c-format
-msgid "unable to open new option file `%.250s'"
-msgstr "kon nieuwe optiebestand `%.250s' niet openen"
-
-#: dselect/methparse.cc:292
+#: dselect/methparse.cc:283
 #, c-format
 msgid "unable to write new option to `%.250s'"
 msgstr "kon nieuwe optie niet wegschrijven naar `%.250s'"
 
-#: dselect/methparse.cc:295
-#, c-format
-msgid "unable to close new option file `%.250s'"
-msgstr "kon nieuwe optiebestand `%.250s' niet afsluiten"
-
-#: dselect/methparse.cc:297
-#, c-format
-msgid "unable to install new option as `%.250s'"
-msgstr "kon nieuwe optie niet installeren als `%.250s'"
-
 #: dselect/pkgdisplay.cc:36
 msgid "new package"
 msgstr "nieuw pakket"
@@ -1450,63 +1439,63 @@ msgstr "Gewist"
 msgid "dselect - recursive package listing"
 msgstr "dselect - recursieve pakkettenlijst"
 
-#: dselect/pkgdisplay.cc:199
+#: dselect/pkgdisplay.cc:200
 msgid "dselect - inspection of package states"
 msgstr "dselect - bekijken pakketstatus"
 
-#: dselect/pkgdisplay.cc:200
+#: dselect/pkgdisplay.cc:201
 msgid "dselect - main package listing"
 msgstr "dselect - hoofdpakkettenlijst"
 
-#: dselect/pkgdisplay.cc:208
+#: dselect/pkgdisplay.cc:209
 msgid " (by section)"
 msgstr " (op sectie)"
 
-#: dselect/pkgdisplay.cc:211
+#: dselect/pkgdisplay.cc:212
 msgid " (avail., section)"
 msgstr " (besch., sectie)"
 
-#: dselect/pkgdisplay.cc:214
+#: dselect/pkgdisplay.cc:215
 msgid " (status, section)"
 msgstr " (status, sectie)"
 
-#: dselect/pkgdisplay.cc:223
+#: dselect/pkgdisplay.cc:224
 msgid " (by priority)"
 msgstr " (op prioriteit)"
 
-#: dselect/pkgdisplay.cc:226
+#: dselect/pkgdisplay.cc:227
 msgid " (avail., priority)"
 msgstr " (besch., prioriteit)"
 
-#: dselect/pkgdisplay.cc:229
+#: dselect/pkgdisplay.cc:230
 msgid " (status, priority)"
 msgstr " (status, prioriteit)"
 
-#: dselect/pkgdisplay.cc:238 dselect/pkgdisplay.cc:250
+#: dselect/pkgdisplay.cc:239
 msgid " (alphabetically)"
 msgstr " (alfabetisch)"
 
-#: dselect/pkgdisplay.cc:241
+#: dselect/pkgdisplay.cc:242
 msgid " (by availability)"
 msgstr " (op beschikbaarheid)"
 
-#: dselect/pkgdisplay.cc:244
+#: dselect/pkgdisplay.cc:245
 msgid " (by status)"
 msgstr " (op status)"
 
-#: dselect/pkgdisplay.cc:258
+#: dselect/pkgdisplay.cc:260
 msgid " mark:+/=/- terse:v help:?"
 msgstr " markeer:+/=/- kort:v hulp:?"
 
-#: dselect/pkgdisplay.cc:259
+#: dselect/pkgdisplay.cc:261
 msgid " mark:+/=/- verbose:v help:?"
 msgstr " markeer:+/=/- lang:v hulp:?"
 
-#: dselect/pkgdisplay.cc:260
+#: dselect/pkgdisplay.cc:263
 msgid " terse:v help:?"
 msgstr " kort:v hulp:?"
 
-#: dselect/pkgdisplay.cc:261
+#: dselect/pkgdisplay.cc:264
 msgid " verbose:v help:?"
 msgstr " lang:v hulp:?"
 
@@ -1547,23 +1536,23 @@ msgstr "Geïnstalleerde informatie uit 'control'-bestanden"
 msgid "Available control file information"
 msgstr "Beschikbare informatie uit 'control'-bestanden"
 
-#: dselect/pkglist.cc:416
+#: dselect/pkglist.cc:421
 msgid "There are no packages."
 msgstr "Er zijn geen pakketten."
 
-#: dselect/pkglist.cc:507
+#: dselect/pkglist.cc:512
 msgid "invalid search option given"
 msgstr "ongeldige zoekoptie opgegeven"
 
-#: dselect/pkglist.cc:521
+#: dselect/pkglist.cc:526
 msgid "error in regular expression"
 msgstr "fout in reguliere expressie"
 
-#: dselect/pkgsublist.cc:107
+#: dselect/pkgsublist.cc:108
 msgid " does not appear to be available\n"
 msgstr " lijkt niet beschikbaar te zijn\n"
 
-#: dselect/pkgsublist.cc:127
+#: dselect/pkgsublist.cc:128
 msgid " or "
 msgstr " of "
 
@@ -1644,3 +1633,12 @@ msgstr "Geïnst.ver"
 #: dselect/pkgtop.cc:289
 msgid "Avail.ver"
 msgstr "Besch.ver"
+
+#~ msgid "unable to open new option file `%.250s'"
+#~ msgstr "kon nieuwe optiebestand `%.250s' niet openen"
+
+#~ msgid "unable to close new option file `%.250s'"
+#~ msgstr "kon nieuwe optiebestand `%.250s' niet afsluiten"
+
+#~ msgid "unable to install new option as `%.250s'"
+#~ msgstr "kon nieuwe optie niet installeren als `%.250s'"