Regenerate .pot files and merge .po files with them

1 files changed, 84 insertions, 95 deletions

diff --git a/dselect/po/dselect.pot b/dselect/po/dselect.pot
index fe3e7891a..e72b66e76 100644
--- a/dselect/po/dselect.pot
+++ b/dselect/po/dselect.pot
@@ -6,9 +6,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: dpkg 1.16.1\n"
+"Project-Id-Version: dpkg 1.16.1.2-363-g996bf9\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2011-09-23 03:38+0200\n"
+"POT-Creation-Date: 2012-03-19 07:23+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -531,127 +531,121 @@ msgid ""
 "  \\                repeat last search\n"
 msgstr ""
 
-#: dselect/main.cc:60
+#: dselect/main.cc:64
 msgid "Type dselect --help for help."
 msgstr ""
 
-#: dselect/main.cc:143
+#: dselect/main.cc:146
 msgid "a"
 msgstr ""
 
-#: dselect/main.cc:143
+#: dselect/main.cc:146
 msgid "[A]ccess"
 msgstr ""
 
-#: dselect/main.cc:143
+#: dselect/main.cc:146
 msgid "Choose the access method to use."
 msgstr ""
 
-#: dselect/main.cc:144
+#: dselect/main.cc:147
 msgid "u"
 msgstr ""
 
-#: dselect/main.cc:144
+#: dselect/main.cc:147
 msgid "[U]pdate"
 msgstr ""
 
-#: dselect/main.cc:144
+#: dselect/main.cc:147
 msgid "Update list of available packages, if possible."
 msgstr ""
 
-#: dselect/main.cc:145
+#: dselect/main.cc:148
 msgid "s"
 msgstr ""
 
-#: dselect/main.cc:145
+#: dselect/main.cc:148
 msgid "[S]elect"
 msgstr ""
 
-#: dselect/main.cc:145
+#: dselect/main.cc:148
 msgid "Request which packages you want on your system."
 msgstr ""
 
-#: dselect/main.cc:146
+#: dselect/main.cc:149
 msgid "i"
 msgstr ""
 
-#: dselect/main.cc:146
+#: dselect/main.cc:149
 msgid "[I]nstall"
 msgstr ""
 
-#: dselect/main.cc:146
+#: dselect/main.cc:149
 msgid "Install and upgrade wanted packages."
 msgstr ""
 
-#: dselect/main.cc:147
+#: dselect/main.cc:150
 msgid "c"
 msgstr ""
 
-#: dselect/main.cc:147
+#: dselect/main.cc:150
 msgid "[C]onfig"
 msgstr ""
 
-#: dselect/main.cc:147
+#: dselect/main.cc:150
 msgid "Configure any packages that are unconfigured."
 msgstr ""
 
-#: dselect/main.cc:148
+#: dselect/main.cc:151
 msgid "r"
 msgstr ""
 
-#: dselect/main.cc:148
+#: dselect/main.cc:151
 msgid "[R]emove"
 msgstr ""
 
-#: dselect/main.cc:148
+#: dselect/main.cc:151
 msgid "Remove unwanted software."
 msgstr ""
 
-#: dselect/main.cc:149
+#: dselect/main.cc:152
 msgid "q"
 msgstr ""
 
-#: dselect/main.cc:149
+#: dselect/main.cc:152
 msgid "[Q]uit"
 msgstr ""
 
-#: dselect/main.cc:149
+#: dselect/main.cc:152
 msgid "Quit dselect."
 msgstr ""
 
-#: dselect/main.cc:150
+#: dselect/main.cc:153
 msgid "menu"
 msgstr ""
 
-#: dselect/main.cc:155
+#: dselect/main.cc:158
 #, c-format
 msgid "Debian `%s' package handling frontend version %s.\n"
 msgstr ""
 
-#: dselect/main.cc:158
-msgid ""
-"Copyright (C) 1994-1996 Ian Jackson.\n"
-"Copyright (C) 2000,2001 Wichert Akkerman.\n"
-msgstr ""
-
-#: 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"
 msgstr ""
 
-#: dselect/main.cc:172 dselect/main.cc:220
+#: dselect/main.cc:170 dselect/main.cc:218
 msgid "<standard output>"
 msgstr ""
 
-#: dselect/main.cc:183
+#: dselect/main.cc:181
 #, c-format
 msgid ""
 "Usage: %s [<option> ...] [<action> ...]\n"
 "\n"
 msgstr ""
 
-#: dselect/main.cc:187
+#: dselect/main.cc:185
 #, c-format
 msgid ""
 "Options:\n"
@@ -663,7 +657,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: dselect/main.cc:196
+#: dselect/main.cc:194
 #, c-format
 msgid ""
 "  --help                     Show this help message.\n"
@@ -671,7 +665,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: dselect/main.cc:201
+#: dselect/main.cc:199
 #, c-format
 msgid ""
 "Actions:\n"
@@ -679,67 +673,71 @@ msgid ""
 "\n"
 msgstr ""
 
-#: dselect/main.cc:205
+#: dselect/main.cc:203
 #, c-format
 msgid "Screenparts:\n"
 msgstr ""
 
-#: dselect/main.cc:210
+#: dselect/main.cc:208
 #, c-format
 msgid "Colours:\n"
 msgstr ""
 
-#: dselect/main.cc:215
+#: dselect/main.cc:213
 #, c-format
 msgid "Attributes:\n"
 msgstr ""
 
-#: dselect/main.cc:233
+#: dselect/main.cc:231
 #, c-format
 msgid "couldn't open debug file `%.255s'\n"
 msgstr ""
 
-#: dselect/main.cc:253
+#: dselect/main.cc:251
 #, c-format
 msgid "Invalid %s `%s'\n"
 msgstr ""
 
-#: dselect/main.cc:270
+#: dselect/main.cc:268
 msgid "screen part"
 msgstr ""
 
-#: dselect/main.cc:276
+#: dselect/main.cc:274
 msgid "Null colour specification\n"
 msgstr ""
 
-#: dselect/main.cc:284 dselect/main.cc:289
+#: dselect/main.cc:282 dselect/main.cc:287
 msgid "colour"
 msgstr ""
 
-#: dselect/main.cc:297
+#: dselect/main.cc:295
 msgid "colour attribute"
 msgstr ""
 
-#: dselect/main.cc:329
+#: dselect/main.cc:327
 msgid "Terminal does not appear to support cursor addressing.\n"
 msgstr ""
 
-#: dselect/main.cc:331
+#: dselect/main.cc:329
 msgid "Terminal does not appear to support highlighting.\n"
 msgstr ""
 
-#: dselect/main.cc:333
+#: dselect/main.cc:331
 #, c-format
 msgid ""
 "Set your TERM variable correctly, use a better terminal,\n"
 "or make do with the per-package management tool %s.\n"
 msgstr ""
 
-#: dselect/main.cc:336
+#: dselect/main.cc:334
 msgid "terminal lacks necessary features, giving up"
 msgstr ""
 
-#: 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"
@@ -748,18 +746,24 @@ msgid ""
 "\n"
 msgstr ""
 
-#: dselect/main.cc:428
+#: dselect/main.cc:427
+msgid ""
+"Copyright (C) 1994-1996 Ian Jackson.\n"
+"Copyright (C) 2000,2001 Wichert Akkerman.\n"
+msgstr ""
+
+#: dselect/main.cc:433
 msgid ""
 "\n"
 "\n"
 "Read-only access: only preview of selections is available!"
 msgstr ""
 
-#: dselect/main.cc:448
+#: dselect/main.cc:453
 msgid "failed to getch in main menu"
 msgstr ""
 
-#: dselect/main.cc:531
+#: dselect/main.cc:536
 #, c-format
 msgid "unknown action string `%.50s'"
 msgstr ""
@@ -781,19 +785,19 @@ msgstr ""
 msgid "Description"
 msgstr ""
 
-#: dselect/methlist.cc:164 dselect/pkglist.cc:572
+#: dselect/methlist.cc:164 dselect/pkglist.cc:577
 msgid "doupdate failed"
 msgstr ""
 
-#: dselect/methlist.cc:166 dselect/pkglist.cc:575
+#: dselect/methlist.cc:166 dselect/pkglist.cc:580
 msgid "failed to unblock SIGWINCH"
 msgstr ""
 
-#: dselect/methlist.cc:170 dselect/pkglist.cc:580
+#: dselect/methlist.cc:170 dselect/pkglist.cc:585
 msgid "failed to re-block SIGWINCH"
 msgstr ""
 
-#: dselect/methlist.cc:171 dselect/pkglist.cc:582
+#: dselect/methlist.cc:171 dselect/pkglist.cc:587
 msgid "getch failed"
 msgstr ""
 
@@ -948,26 +952,11 @@ msgstr ""
 msgid "unable to open current option file `%.250s'"
 msgstr ""
 
-#: dselect/methparse.cc:289
-#, c-format
-msgid "unable to open new option file `%.250s'"
-msgstr ""
-
-#: dselect/methparse.cc:292
+#: dselect/methparse.cc:283
 #, c-format
 msgid "unable to write new option to `%.250s'"
 msgstr ""
 
-#: dselect/methparse.cc:295
-#, c-format
-msgid "unable to close new option file `%.250s'"
-msgstr ""
-
-#: dselect/methparse.cc:297
-#, c-format
-msgid "unable to install new option as `%.250s'"
-msgstr ""
-
 #: dselect/pkgdisplay.cc:36
 msgid "new package"
 msgstr ""
@@ -1204,63 +1193,63 @@ msgstr ""
 msgid "dselect - recursive package listing"
 msgstr ""
 
-#: dselect/pkgdisplay.cc:199
+#: dselect/pkgdisplay.cc:200
 msgid "dselect - inspection of package states"
 msgstr ""
 
-#: dselect/pkgdisplay.cc:200
+#: dselect/pkgdisplay.cc:201
 msgid "dselect - main package listing"
 msgstr ""
 
-#: dselect/pkgdisplay.cc:208
+#: dselect/pkgdisplay.cc:209
 msgid " (by section)"
 msgstr ""
 
-#: dselect/pkgdisplay.cc:211
+#: dselect/pkgdisplay.cc:212
 msgid " (avail., section)"
 msgstr ""
 
-#: dselect/pkgdisplay.cc:214
+#: dselect/pkgdisplay.cc:215
 msgid " (status, section)"
 msgstr ""
 
-#: dselect/pkgdisplay.cc:223
+#: dselect/pkgdisplay.cc:224
 msgid " (by priority)"
 msgstr ""
 
-#: dselect/pkgdisplay.cc:226
+#: dselect/pkgdisplay.cc:227
 msgid " (avail., priority)"
 msgstr ""
 
-#: dselect/pkgdisplay.cc:229
+#: dselect/pkgdisplay.cc:230
 msgid " (status, priority)"
 msgstr ""
 
-#: dselect/pkgdisplay.cc:238 dselect/pkgdisplay.cc:250
+#: dselect/pkgdisplay.cc:239
 msgid " (alphabetically)"
 msgstr ""
 
-#: dselect/pkgdisplay.cc:241
+#: dselect/pkgdisplay.cc:242
 msgid " (by availability)"
 msgstr ""
 
-#: dselect/pkgdisplay.cc:244
+#: dselect/pkgdisplay.cc:245
 msgid " (by status)"
 msgstr ""
 
-#: dselect/pkgdisplay.cc:258
+#: dselect/pkgdisplay.cc:260
 msgid " mark:+/=/- terse:v help:?"
 msgstr ""
 
-#: dselect/pkgdisplay.cc:259
+#: dselect/pkgdisplay.cc:261
 msgid " mark:+/=/- verbose:v help:?"
 msgstr ""
 
-#: dselect/pkgdisplay.cc:260
+#: dselect/pkgdisplay.cc:263
 msgid " terse:v help:?"
 msgstr ""
 
-#: dselect/pkgdisplay.cc:261
+#: dselect/pkgdisplay.cc:264
 msgid " verbose:v help:?"
 msgstr ""
 
@@ -1292,23 +1281,23 @@ msgstr ""
 msgid "Available control file information"
 msgstr ""
 
-#: dselect/pkglist.cc:416
+#: dselect/pkglist.cc:421
 msgid "There are no packages."
 msgstr ""
 
-#: dselect/pkglist.cc:507
+#: dselect/pkglist.cc:512
 msgid "invalid search option given"
 msgstr ""
 
-#: dselect/pkglist.cc:521
+#: dselect/pkglist.cc:526
 msgid "error in regular expression"
 msgstr ""
 
-#: dselect/pkgsublist.cc:107
+#: dselect/pkgsublist.cc:108
 msgid " does not appear to be available\n"
 msgstr ""
 
-#: dselect/pkgsublist.cc:127
+#: dselect/pkgsublist.cc:128
 msgid " or "
 msgstr ""