Regenerate .pot files and merge .po files with them

1 files changed, 74 insertions, 70 deletions

diff --git a/dselect/po/dselect.pot b/dselect/po/dselect.pot
index 831e19da4..9cba74e77 100644
--- a/dselect/po/dselect.pot
+++ b/dselect/po/dselect.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2009-05-26 01:10+0200\n"
+"POT-Creation-Date: 2009-09-06 09:05+0200\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"
@@ -16,33 +16,33 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: dselect/basecmds.cc:124
+#: dselect/basecmds.cc:122
 msgid "Search for ? "
 msgstr ""
 
-#: dselect/basecmds.cc:146
+#: dselect/basecmds.cc:144
 msgid "Error: "
 msgstr ""
 
-#: dselect/basecmds.cc:175
+#: dselect/basecmds.cc:173
 msgid "Help: "
 msgstr ""
 
-#: dselect/basecmds.cc:181
+#: dselect/basecmds.cc:179
 msgid "Press ? for help menu, . for next topic, <space> to exit help."
 msgstr ""
 
-#: dselect/basecmds.cc:188
+#: dselect/basecmds.cc:186
 msgid "Help information is available under the following topics:"
 msgstr ""
 
-#: dselect/basecmds.cc:196
+#: dselect/basecmds.cc:194
 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. "
 msgstr ""
 
-#: dselect/basecmds.cc:202
+#: dselect/basecmds.cc:200
 msgid "error reading keyboard in help"
 msgstr ""
 
@@ -129,144 +129,144 @@ msgstr ""
 msgid "%s to go back"
 msgstr ""
 
-#: dselect/bindings.cc:76
+#: dselect/bindings.cc:75
 msgid "[not bound]"
 msgstr ""
 
-#: dselect/bindings.cc:80
+#: dselect/bindings.cc:79
 #, c-format
 msgid "[unk: %d]"
 msgstr ""
 
-#: dselect/bindings.cc:137
+#: dselect/bindings.cc:136
 msgid "Scroll onwards through help/information"
 msgstr ""
 
-#: dselect/bindings.cc:138
+#: dselect/bindings.cc:137
 msgid "Scroll backwards through help/information"
 msgstr ""
 
-#: dselect/bindings.cc:139
+#: dselect/bindings.cc:138
 msgid "Move up"
 msgstr ""
 
-#: dselect/bindings.cc:140
+#: dselect/bindings.cc:139
 msgid "Move down"
 msgstr ""
 
-#: dselect/bindings.cc:141
+#: dselect/bindings.cc:140
 msgid "Go to top of list"
 msgstr ""
 
-#: dselect/bindings.cc:142
+#: dselect/bindings.cc:141
 msgid "Go to end of list"
 msgstr ""
 
-#: dselect/bindings.cc:143
+#: dselect/bindings.cc:142
 msgid "Request help (cycle through help screens)"
 msgstr ""
 
-#: dselect/bindings.cc:144
+#: dselect/bindings.cc:143
 msgid "Cycle through information displays"
 msgstr ""
 
-#: dselect/bindings.cc:145
+#: dselect/bindings.cc:144
 msgid "Redraw display"
 msgstr ""
 
-#: dselect/bindings.cc:146
+#: dselect/bindings.cc:145
 msgid "Scroll onwards through list by 1 line"
 msgstr ""
 
-#: dselect/bindings.cc:147
+#: dselect/bindings.cc:146
 msgid "Scroll backwards through list by 1 line"
 msgstr ""
 
-#: dselect/bindings.cc:148
+#: dselect/bindings.cc:147
 msgid "Scroll onwards through help/information by 1 line"
 msgstr ""
 
-#: dselect/bindings.cc:149
+#: dselect/bindings.cc:148
 msgid "Scroll backwards through help/information by 1 line"
 msgstr ""
 
-#: dselect/bindings.cc:150
+#: dselect/bindings.cc:149
 msgid "Scroll onwards through list"
 msgstr ""
 
-#: dselect/bindings.cc:151
+#: dselect/bindings.cc:150
 msgid "Scroll backwards through list"
 msgstr ""
 
-#: dselect/bindings.cc:154
+#: dselect/bindings.cc:153
 msgid "Mark package(s) for installation"
 msgstr ""
 
-#: dselect/bindings.cc:155
+#: dselect/bindings.cc:154
 msgid "Mark package(s) for deinstallation"
 msgstr ""
 
-#: dselect/bindings.cc:156
+#: dselect/bindings.cc:155
 msgid "Mark package(s) for deinstall and purge"
 msgstr ""
 
-#: dselect/bindings.cc:157
+#: dselect/bindings.cc:156
 msgid "Make highlight more specific"
 msgstr ""
 
-#: dselect/bindings.cc:158
+#: dselect/bindings.cc:157
 msgid "Make highlight less specific"
 msgstr ""
 
-#: dselect/bindings.cc:159
+#: dselect/bindings.cc:158
 msgid "Search for a package whose name contains a string"
 msgstr ""
 
-#: dselect/bindings.cc:160
+#: dselect/bindings.cc:159
 msgid "Repeat last search."
 msgstr ""
 
-#: dselect/bindings.cc:161
+#: dselect/bindings.cc:160
 msgid "Swap sort order priority/section"
 msgstr ""
 
-#: dselect/bindings.cc:162
+#: dselect/bindings.cc:161
 msgid "Quit, confirming, and checking dependencies"
 msgstr ""
 
-#: dselect/bindings.cc:163
+#: dselect/bindings.cc:162
 msgid "Quit, confirming without check"
 msgstr ""
 
-#: dselect/bindings.cc:164
+#: dselect/bindings.cc:163
 msgid "Quit, rejecting conflict/dependency suggestions"
 msgstr ""
 
-#: dselect/bindings.cc:165
+#: dselect/bindings.cc:164
 msgid "Abort - quit without making changes"
 msgstr ""
 
-#: dselect/bindings.cc:166
+#: dselect/bindings.cc:165
 msgid "Revert to old state for all packages"
 msgstr ""
 
-#: dselect/bindings.cc:167
+#: dselect/bindings.cc:166
 msgid "Revert to suggested state for all packages"
 msgstr ""
 
-#: dselect/bindings.cc:168
+#: dselect/bindings.cc:167
 msgid "Revert to directly requested state for all packages"
 msgstr ""
 
-#: dselect/bindings.cc:169
+#: dselect/bindings.cc:168
 msgid "Revert to currently installed state for all packages"
 msgstr ""
 
-#: dselect/bindings.cc:172
+#: dselect/bindings.cc:171
 msgid "Select currently-highlighted access method"
 msgstr ""
 
-#: dselect/bindings.cc:173
+#: dselect/bindings.cc:172
 msgid "Quit without changing selected access method"
 msgstr ""
 
@@ -641,14 +641,18 @@ msgid ""
 "See %s --license for copyright and license details.\n"
 msgstr ""
 
-#: dselect/main.cc:183
+#: dselect/main.cc:176 dselect/main.cc:223
+msgid "<standard output>"
+msgstr ""
+
+#: dselect/main.cc:185
 #, c-format
 msgid ""
 "Usage: %s [<option> ...] [<action> ...]\n"
 "\n"
 msgstr ""
 
-#: dselect/main.cc:187
+#: dselect/main.cc:189
 #, c-format
 msgid ""
 "Options:\n"
@@ -660,7 +664,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: dselect/main.cc:196
+#: dselect/main.cc:198
 #, c-format
 msgid ""
 "  --help                     Show this help message.\n"
@@ -669,7 +673,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: dselect/main.cc:202
+#: dselect/main.cc:204
 #, c-format
 msgid ""
 "Actions:\n"
@@ -677,67 +681,67 @@ msgid ""
 "\n"
 msgstr ""
 
-#: dselect/main.cc:206
+#: dselect/main.cc:208
 #, c-format
 msgid "Screenparts:\n"
 msgstr ""
 
-#: dselect/main.cc:211
+#: dselect/main.cc:213
 #, c-format
 msgid "Colours:\n"
 msgstr ""
 
-#: dselect/main.cc:216
+#: dselect/main.cc:218
 #, c-format
 msgid "Attributes:\n"
 msgstr ""
 
-#: dselect/main.cc:227
+#: dselect/main.cc:231
 #, c-format
 msgid "couldn't open debug file `%.255s'\n"
 msgstr ""
 
-#: dselect/main.cc:244
+#: dselect/main.cc:248
 #, c-format
 msgid "Invalid %s `%s'\n"
 msgstr ""
 
-#: dselect/main.cc:261
+#: dselect/main.cc:265
 msgid "screen part"
 msgstr ""
 
-#: dselect/main.cc:267
+#: dselect/main.cc:271
 msgid "Null colour specification\n"
 msgstr ""
 
-#: dselect/main.cc:275 dselect/main.cc:280
+#: dselect/main.cc:279 dselect/main.cc:284
 msgid "colour"
 msgstr ""
 
-#: dselect/main.cc:288
+#: dselect/main.cc:292
 msgid "colour attribute"
 msgstr ""
 
-#: dselect/main.cc:322
+#: dselect/main.cc:326
 msgid "Terminal does not appear to support cursor addressing.\n"
 msgstr ""
 
-#: dselect/main.cc:324
+#: dselect/main.cc:328
 msgid "Terminal does not appear to support highlighting.\n"
 msgstr ""
 
-#: dselect/main.cc:326
+#: dselect/main.cc:330
 #, 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:329
+#: dselect/main.cc:333
 msgid "terminal lacks necessary features, giving up"
 msgstr ""
 
-#: dselect/main.cc:411
+#: dselect/main.cc:415
 msgid ""
 "\n"
 "\n"
@@ -746,18 +750,18 @@ msgid ""
 "\n"
 msgstr ""
 
-#: dselect/main.cc:426
+#: dselect/main.cc:430
 msgid ""
 "\n"
 "\n"
 "Read-only access: only preview of selections is available!"
 msgstr ""
 
-#: dselect/main.cc:445
+#: dselect/main.cc:449
 msgid "failed to getch in main menu"
 msgstr ""
 
-#: dselect/main.cc:521
+#: dselect/main.cc:525
 #, c-format
 msgid "unknown action string `%.50s'"
 msgstr ""
@@ -862,23 +866,23 @@ msgstr ""
 msgid "Press <enter> to continue.\n"
 msgstr ""
 
-#: dselect/method.cc:184
-msgid "write error on standard error"
+#: dselect/method.cc:183
+msgid "<standard error>"
 msgstr ""
 
-#: dselect/method.cc:187
+#: dselect/method.cc:186
 msgid "error reading acknowledgement of program failure message"
 msgstr ""
 
-#: dselect/method.cc:218
+#: dselect/method.cc:217
 msgid "update available list script"
 msgstr ""
 
-#: dselect/method.cc:222
+#: dselect/method.cc:221
 msgid "installation script"
 msgstr ""
 
-#: dselect/method.cc:270
+#: dselect/method.cc:269
 msgid "query/setup script"
 msgstr ""