Regenerate .pot files and merge .po files with them

1 files changed, 272 insertions, 282 deletions

diff --git a/dselect/po/dselect.pot b/dselect/po/dselect.pot
index 9cba74e77..17fd0d5a0 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-09-06 09:05+0200\n"
+"POT-Creation-Date: 2009-11-13 12:18+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"
@@ -16,265 +16,265 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: dselect/basecmds.cc:122
+#: dselect/basecmds.cc:120
 msgid "Search for ? "
 msgstr ""
 
-#: dselect/basecmds.cc:144
+#: dselect/basecmds.cc:142
 msgid "Error: "
 msgstr ""
 
-#: dselect/basecmds.cc:173
+#: dselect/basecmds.cc:171
 msgid "Help: "
 msgstr ""
 
-#: dselect/basecmds.cc:179
+#: dselect/basecmds.cc:177
 msgid "Press ? for help menu, . for next topic, <space> to exit help."
 msgstr ""
 
-#: dselect/basecmds.cc:186
+#: dselect/basecmds.cc:184
 msgid "Help information is available under the following topics:"
 msgstr ""
 
-#: dselect/basecmds.cc:194
+#: dselect/basecmds.cc:192
 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:200
+#: dselect/basecmds.cc:198
 msgid "error reading keyboard in help"
 msgstr ""
 
-#: dselect/baselist.cc:58
+#: dselect/baselist.cc:57
 msgid "ioctl(TIOCGWINSZ) failed"
 msgstr ""
 
-#: dselect/baselist.cc:61
+#: dselect/baselist.cc:60
 msgid "doupdate in SIGWINCH handler failed"
 msgstr ""
 
-#: dselect/baselist.cc:68
+#: dselect/baselist.cc:67
 msgid "failed to restore old SIGWINCH sigact"
 msgstr ""
 
-#: dselect/baselist.cc:70
+#: dselect/baselist.cc:69
 msgid "failed to restore old signal mask"
 msgstr ""
 
-#: dselect/baselist.cc:80
+#: dselect/baselist.cc:79
 msgid "failed to get old signal mask"
 msgstr ""
 
-#: dselect/baselist.cc:81
+#: dselect/baselist.cc:80
 msgid "failed to get old SIGWINCH sigact"
 msgstr ""
 
-#: dselect/baselist.cc:85
+#: dselect/baselist.cc:84
 msgid "failed to block SIGWINCH"
 msgstr ""
 
-#: dselect/baselist.cc:90
+#: dselect/baselist.cc:89
 msgid "failed to set new SIGWINCH sigact"
 msgstr ""
 
-#: dselect/baselist.cc:127
+#: dselect/baselist.cc:126
 msgid "failed to allocate colour pair"
 msgstr ""
 
-#: dselect/baselist.cc:168
+#: dselect/baselist.cc:167
 msgid "failed to create title window"
 msgstr ""
 
-#: dselect/baselist.cc:172
+#: dselect/baselist.cc:171
 msgid "failed to create whatinfo window"
 msgstr ""
 
-#: dselect/baselist.cc:176
+#: dselect/baselist.cc:175
 msgid "failed to create baselist pad"
 msgstr ""
 
-#: dselect/baselist.cc:179
+#: dselect/baselist.cc:178
 msgid "failed to create heading pad"
 msgstr ""
 
-#: dselect/baselist.cc:183
+#: dselect/baselist.cc:182
 msgid "failed to create thisstate pad"
 msgstr ""
 
-#: dselect/baselist.cc:187
+#: dselect/baselist.cc:186
 msgid "failed to create info pad"
 msgstr ""
 
-#: dselect/baselist.cc:192
+#: dselect/baselist.cc:191
 msgid "failed to create query window"
 msgstr ""
 
-#: dselect/baselist.cc:261
+#: dselect/baselist.cc:260
 msgid "Keybindings"
 msgstr ""
 
-#: dselect/baselist.cc:309
+#: dselect/baselist.cc:308
 #, c-format
 msgid "  -- %d%%, press "
 msgstr ""
 
-#: dselect/baselist.cc:312
+#: dselect/baselist.cc:311
 #, c-format
 msgid "%s for more"
 msgstr ""
 
-#: dselect/baselist.cc:316
+#: dselect/baselist.cc:315
 #, c-format
 msgid "%s to go back"
 msgstr ""
 
-#: dselect/bindings.cc:75
+#: dselect/bindings.cc:73
 msgid "[not bound]"
 msgstr ""
 
-#: dselect/bindings.cc:79
+#: dselect/bindings.cc:77
 #, c-format
 msgid "[unk: %d]"
 msgstr ""
 
-#: dselect/bindings.cc:136
+#: dselect/bindings.cc:134
 msgid "Scroll onwards through help/information"
 msgstr ""
 
-#: dselect/bindings.cc:137
+#: dselect/bindings.cc:135
 msgid "Scroll backwards through help/information"
 msgstr ""
 
-#: dselect/bindings.cc:138
+#: dselect/bindings.cc:136
 msgid "Move up"
 msgstr ""
 
-#: dselect/bindings.cc:139
+#: dselect/bindings.cc:137
 msgid "Move down"
 msgstr ""
 
-#: dselect/bindings.cc:140
+#: dselect/bindings.cc:138
 msgid "Go to top of list"
 msgstr ""
 
-#: dselect/bindings.cc:141
+#: dselect/bindings.cc:139
 msgid "Go to end of list"
 msgstr ""
 
-#: dselect/bindings.cc:142
+#: dselect/bindings.cc:140
 msgid "Request help (cycle through help screens)"
 msgstr ""
 
-#: dselect/bindings.cc:143
+#: dselect/bindings.cc:141
 msgid "Cycle through information displays"
 msgstr ""
 
-#: dselect/bindings.cc:144
+#: dselect/bindings.cc:142
 msgid "Redraw display"
 msgstr ""
 
-#: dselect/bindings.cc:145
+#: dselect/bindings.cc:143
 msgid "Scroll onwards through list by 1 line"
 msgstr ""
 
-#: dselect/bindings.cc:146
+#: dselect/bindings.cc:144
 msgid "Scroll backwards through list by 1 line"
 msgstr ""
 
-#: dselect/bindings.cc:147
+#: dselect/bindings.cc:145
 msgid "Scroll onwards through help/information by 1 line"
 msgstr ""
 
-#: dselect/bindings.cc:148
+#: dselect/bindings.cc:146
 msgid "Scroll backwards through help/information by 1 line"
 msgstr ""
 
-#: dselect/bindings.cc:149
+#: dselect/bindings.cc:147
 msgid "Scroll onwards through list"
 msgstr ""
 
-#: dselect/bindings.cc:150
+#: dselect/bindings.cc:148
 msgid "Scroll backwards through list"
 msgstr ""
 
-#: dselect/bindings.cc:153
+#: dselect/bindings.cc:151
 msgid "Mark package(s) for installation"
 msgstr ""
 
-#: dselect/bindings.cc:154
+#: dselect/bindings.cc:152
 msgid "Mark package(s) for deinstallation"
 msgstr ""
 
-#: dselect/bindings.cc:155
+#: dselect/bindings.cc:153
 msgid "Mark package(s) for deinstall and purge"
 msgstr ""
 
-#: dselect/bindings.cc:156
+#: dselect/bindings.cc:154
 msgid "Make highlight more specific"
 msgstr ""
 
-#: dselect/bindings.cc:157
+#: dselect/bindings.cc:155
 msgid "Make highlight less specific"
 msgstr ""
 
-#: dselect/bindings.cc:158
+#: dselect/bindings.cc:156
 msgid "Search for a package whose name contains a string"
 msgstr ""
 
-#: dselect/bindings.cc:159
+#: dselect/bindings.cc:157
 msgid "Repeat last search."
 msgstr ""
 
-#: dselect/bindings.cc:160
+#: dselect/bindings.cc:158
 msgid "Swap sort order priority/section"
 msgstr ""
 
-#: dselect/bindings.cc:161
+#: dselect/bindings.cc:159
 msgid "Quit, confirming, and checking dependencies"
 msgstr ""
 
-#: dselect/bindings.cc:162
+#: dselect/bindings.cc:160
 msgid "Quit, confirming without check"
 msgstr ""
 
-#: dselect/bindings.cc:163
+#: dselect/bindings.cc:161
 msgid "Quit, rejecting conflict/dependency suggestions"
 msgstr ""
 
-#: dselect/bindings.cc:164
+#: dselect/bindings.cc:162
 msgid "Abort - quit without making changes"
 msgstr ""
 
-#: dselect/bindings.cc:165
+#: dselect/bindings.cc:163
 msgid "Revert to old state for all packages"
 msgstr ""
 
-#: dselect/bindings.cc:166
+#: dselect/bindings.cc:164
 msgid "Revert to suggested state for all packages"
 msgstr ""
 
-#: dselect/bindings.cc:167
+#: dselect/bindings.cc:165
 msgid "Revert to directly requested state for all packages"
 msgstr ""
 
-#: dselect/bindings.cc:168
+#: dselect/bindings.cc:166
 msgid "Revert to currently installed state for all packages"
 msgstr ""
 
-#: dselect/bindings.cc:171
+#: dselect/bindings.cc:169
 msgid "Select currently-highlighted access method"
 msgstr ""
 
-#: dselect/bindings.cc:172
+#: dselect/bindings.cc:170
 msgid "Quit without changing selected access method"
 msgstr ""
 
-#: dselect/helpmsgs.cc:30
+#: dselect/helpmsgs.cc:29
 msgid "Keystrokes"
 msgstr ""
 
-#: dselect/helpmsgs.cc:30
+#: dselect/helpmsgs.cc:29
 msgid ""
 "Motion keys: Next/Previous, Top/End, Up/Down, Backwards/Forwards:\n"
 "  j, Down-arrow         k, Up-arrow             move highlight\n"
@@ -306,11 +306,11 @@ msgid ""
 "   D     set all to Directly requested state  n, \\  repeat last search\n"
 msgstr ""
 
-#: dselect/helpmsgs.cc:56
+#: dselect/helpmsgs.cc:55
 msgid "Introduction to package selections"
 msgstr ""
 
-#: dselect/helpmsgs.cc:56
+#: dselect/helpmsgs.cc:55
 msgid ""
 "Welcome to dselect's main package listing.\n"
 "\n"
@@ -341,11 +341,11 @@ msgid ""
 "Press <space> to leave help and enter the list now.\n"
 msgstr ""
 
-#: dselect/helpmsgs.cc:81
+#: dselect/helpmsgs.cc:80
 msgid "Introduction to read-only package list browser"
 msgstr ""
 
-#: dselect/helpmsgs.cc:81
+#: dselect/helpmsgs.cc:80
 msgid ""
 "Welcome to dselect's main package listing.\n"
 "\n"
@@ -366,11 +366,11 @@ msgid ""
 "Press <space> to leave help and enter the list now.\n"
 msgstr ""
 
-#: dselect/helpmsgs.cc:100
+#: dselect/helpmsgs.cc:99
 msgid "Introduction to conflict/dependency resolution sub-list"
 msgstr ""
 
-#: dselect/helpmsgs.cc:100
+#: dselect/helpmsgs.cc:99
 msgid ""
 "Dependency/conflict resolution - introduction.\n"
 "\n"
@@ -405,11 +405,11 @@ msgid ""
 "help.\n"
 msgstr ""
 
-#: dselect/helpmsgs.cc:126
+#: dselect/helpmsgs.cc:125
 msgid "Display, part 1: package listing and status chars"
 msgstr ""
 
-#: dselect/helpmsgs.cc:126
+#: dselect/helpmsgs.cc:125
 msgid ""
 "The top half of the screen shows a list of packages.  For each package you "
 "see\n"
@@ -442,11 +442,11 @@ msgid ""
 "description.\n"
 msgstr ""
 
-#: dselect/helpmsgs.cc:153
+#: dselect/helpmsgs.cc:152
 msgid "Display, part 2: list highlight; information display"
 msgstr ""
 
-#: dselect/helpmsgs.cc:153
+#: dselect/helpmsgs.cc:152
 msgid ""
 "* Highlight: One line in the package list will be highlighted.  It "
 "indicates\n"
@@ -473,11 +473,11 @@ msgid ""
 "  information display or expand it to use almost all of the screen.\n"
 msgstr ""
 
-#: dselect/helpmsgs.cc:177
+#: dselect/helpmsgs.cc:176
 msgid "Introduction to method selection display"
 msgstr ""
 
-#: dselect/helpmsgs.cc:177
+#: dselect/helpmsgs.cc:176
 msgid ""
 "dselect and dpkg can do automatic installation, loading the package files to "
 "be\n"
@@ -501,11 +501,11 @@ msgid ""
 "menu reachable by pressing `?'.\n"
 msgstr ""
 
-#: dselect/helpmsgs.cc:197
+#: dselect/helpmsgs.cc:196
 msgid "Keystrokes for method selection"
 msgstr ""
 
-#: dselect/helpmsgs.cc:197
+#: dselect/helpmsgs.cc:196
 msgid ""
 "Motion keys: Next/Previous, Top/End, Up/Down, Backwards/Forwards:\n"
 "  j, Down-arrow         k, Up-arrow             move highlight\n"
@@ -530,110 +530,110 @@ msgid ""
 "  \\                repeat last search\n"
 msgstr ""
 
-#: dselect/main.cc:63
+#: dselect/main.cc:61
 msgid "Type dselect --help for help."
 msgstr ""
 
-#: dselect/main.cc:146
+#: dselect/main.cc:144
 msgid "a"
 msgstr ""
 
-#: dselect/main.cc:146
+#: dselect/main.cc:144
 msgid "[A]ccess"
 msgstr ""
 
-#: dselect/main.cc:146
+#: dselect/main.cc:144
 msgid "Choose the access method to use."
 msgstr ""
 
-#: dselect/main.cc:147
+#: dselect/main.cc:145
 msgid "u"
 msgstr ""
 
-#: dselect/main.cc:147
+#: dselect/main.cc:145
 msgid "[U]pdate"
 msgstr ""
 
-#: dselect/main.cc:147
+#: dselect/main.cc:145
 msgid "Update list of available packages, if possible."
 msgstr ""
 
-#: dselect/main.cc:148
+#: dselect/main.cc:146
 msgid "s"
 msgstr ""
 
-#: dselect/main.cc:148
+#: dselect/main.cc:146
 msgid "[S]elect"
 msgstr ""
 
-#: dselect/main.cc:148
+#: dselect/main.cc:146
 msgid "Request which packages you want on your system."
 msgstr ""
 
-#: dselect/main.cc:149
+#: dselect/main.cc:147
 msgid "i"
 msgstr ""
 
-#: dselect/main.cc:149
+#: dselect/main.cc:147
 msgid "[I]nstall"
 msgstr ""
 
-#: dselect/main.cc:149
+#: dselect/main.cc:147
 msgid "Install and upgrade wanted packages."
 msgstr ""
 
-#: dselect/main.cc:150
+#: dselect/main.cc:148
 msgid "c"
 msgstr ""
 
-#: dselect/main.cc:150
+#: dselect/main.cc:148
 msgid "[C]onfig"
 msgstr ""
 
-#: dselect/main.cc:150
+#: dselect/main.cc:148
 msgid "Configure any packages that are unconfigured."
 msgstr ""
 
-#: dselect/main.cc:151
+#: dselect/main.cc:149
 msgid "r"
 msgstr ""
 
-#: dselect/main.cc:151
+#: dselect/main.cc:149
 msgid "[R]emove"
 msgstr ""
 
-#: dselect/main.cc:151
+#: dselect/main.cc:149
 msgid "Remove unwanted software."
 msgstr ""
 
-#: dselect/main.cc:152
+#: dselect/main.cc:150
 msgid "q"
 msgstr ""
 
-#: dselect/main.cc:152
+#: dselect/main.cc:150
 msgid "[Q]uit"
 msgstr ""
 
-#: dselect/main.cc:152
+#: dselect/main.cc:150
 msgid "Quit dselect."
 msgstr ""
 
-#: dselect/main.cc:153
+#: dselect/main.cc:151
 msgid "menu"
 msgstr ""
 
-#: dselect/main.cc:158
+#: dselect/main.cc:156
 #, c-format
 msgid "Debian `%s' package handling frontend version %s.\n"
 msgstr ""
 
-#: dselect/main.cc:161
+#: dselect/main.cc:159
 msgid ""
 "Copyright (C) 1994-1996 Ian Jackson.\n"
 "Copyright (C) 2000,2001 Wichert Akkerman.\n"
 msgstr ""
 
-#: dselect/main.cc:165
+#: dselect/main.cc:163
 #, c-format
 msgid ""
 "This is free software; see the GNU General Public License version 2 or\n"
@@ -641,7 +641,7 @@ msgid ""
 "See %s --license for copyright and license details.\n"
 msgstr ""
 
-#: dselect/main.cc:176 dselect/main.cc:223
+#: dselect/main.cc:174 dselect/main.cc:223
 msgid "<standard output>"
 msgstr ""
 
@@ -696,52 +696,52 @@ msgstr ""
 msgid "Attributes:\n"
 msgstr ""
 
-#: dselect/main.cc:231
+#: dselect/main.cc:233
 #, c-format
 msgid "couldn't open debug file `%.255s'\n"
 msgstr ""
 
-#: dselect/main.cc:248
+#: dselect/main.cc:250
 #, c-format
 msgid "Invalid %s `%s'\n"
 msgstr ""
 
-#: dselect/main.cc:265
+#: dselect/main.cc:267
 msgid "screen part"
 msgstr ""
 
-#: dselect/main.cc:271
+#: dselect/main.cc:273
 msgid "Null colour specification\n"
 msgstr ""
 
-#: dselect/main.cc:279 dselect/main.cc:284
+#: dselect/main.cc:281 dselect/main.cc:286
 msgid "colour"
 msgstr ""
 
-#: dselect/main.cc:292
+#: dselect/main.cc:294
 msgid "colour attribute"
 msgstr ""
 
-#: dselect/main.cc:326
+#: dselect/main.cc:328
 msgid "Terminal does not appear to support cursor addressing.\n"
 msgstr ""
 
-#: dselect/main.cc:328
+#: dselect/main.cc:330
 msgid "Terminal does not appear to support highlighting.\n"
 msgstr ""
 
-#: dselect/main.cc:330
+#: dselect/main.cc:332
 #, 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:333
+#: dselect/main.cc:335
 msgid "terminal lacks necessary features, giving up"
 msgstr ""
 
-#: dselect/main.cc:415
+#: dselect/main.cc:417
 msgid ""
 "\n"
 "\n"
@@ -750,64 +750,64 @@ msgid ""
 "\n"
 msgstr ""
 
-#: dselect/main.cc:430
+#: dselect/main.cc:432
 msgid ""
 "\n"
 "\n"
 "Read-only access: only preview of selections is available!"
 msgstr ""
 
-#: dselect/main.cc:449
+#: dselect/main.cc:451
 msgid "failed to getch in main menu"
 msgstr ""
 
-#: dselect/main.cc:525
+#: dselect/main.cc:527
 #, c-format
 msgid "unknown action string `%.50s'"
 msgstr ""
 
-#: dselect/methlist.cc:79
+#: dselect/methlist.cc:77
 msgid "dselect - list of access methods"
 msgstr ""
 
-#: dselect/methlist.cc:88
+#: dselect/methlist.cc:86
 #, c-format
 msgid "Access method `%s'."
 msgstr ""
 
-#: dselect/methlist.cc:122
+#: dselect/methlist.cc:120
 msgid "Abbrev."
 msgstr ""
 
-#: dselect/methlist.cc:123 dselect/pkginfo.cc:107 dselect/pkgtop.cc:303
+#: dselect/methlist.cc:121 dselect/pkginfo.cc:105 dselect/pkgtop.cc:301
 msgid "Description"
 msgstr ""
 
-#: dselect/methlist.cc:167 dselect/pkglist.cc:567
+#: dselect/methlist.cc:165 dselect/pkglist.cc:565
 msgid "doupdate failed"
 msgstr ""
 
-#: dselect/methlist.cc:169 dselect/pkglist.cc:570
+#: dselect/methlist.cc:167 dselect/pkglist.cc:568
 msgid "failed to unblock SIGWINCH"
 msgstr ""
 
-#: dselect/methlist.cc:173 dselect/pkglist.cc:575
+#: dselect/methlist.cc:171 dselect/pkglist.cc:573
 msgid "failed to re-block SIGWINCH"
 msgstr ""
 
-#: dselect/methlist.cc:174 dselect/pkglist.cc:577
+#: dselect/methlist.cc:172 dselect/pkglist.cc:575
 msgid "getch failed"
 msgstr ""
 
-#: dselect/methlist.cc:192
+#: dselect/methlist.cc:190
 msgid "Explanation"
 msgstr ""
 
-#: dselect/methlist.cc:201
+#: dselect/methlist.cc:199
 msgid "No explanation available."
 msgstr ""
 
-#: dselect/method.cc:68
+#: dselect/method.cc:66
 #, c-format
 msgid ""
 "\n"
@@ -815,494 +815,484 @@ msgid ""
 "%s: %s\n"
 msgstr ""
 
-#: dselect/method.cc:71
+#: dselect/method.cc:69
 msgid ""
 "\n"
 "Press <enter> to continue."
 msgstr ""
 
-#: dselect/method.cc:152
+#: dselect/method.cc:150
 #, c-format
 msgid "unable to run %.250s process `%.250s'"
 msgstr ""
 
-#: dselect/method.cc:156
-#, c-format
-msgid "unable to wait for %.250s"
-msgstr ""
-
-#: dselect/method.cc:158
-#, c-format
-msgid "got wrong child's status - asked for %ld, got %ld"
-msgstr ""
-
-#: dselect/method.cc:169
+#: dselect/method.cc:164
 #, c-format
 msgid "returned error exit status %d.\n"
 msgstr ""
 
-#: dselect/method.cc:173
+#: dselect/method.cc:168
 #, c-format
 msgid "was interrupted.\n"
 msgstr ""
 
-#: dselect/method.cc:175
+#: dselect/method.cc:170
 #, c-format
 msgid "was terminated by a signal: %s.\n"
 msgstr ""
 
-#: dselect/method.cc:178
+#: dselect/method.cc:173
 #, c-format
 msgid "(It left a coredump.)\n"
 msgstr ""
 
-#: dselect/method.cc:180
+#: dselect/method.cc:175
 #, c-format
 msgid "failed with an unknown wait return code %d.\n"
 msgstr ""
 
-#: dselect/method.cc:182
+#: dselect/method.cc:177
 #, c-format
 msgid "Press <enter> to continue.\n"
 msgstr ""
 
-#: dselect/method.cc:183
+#: dselect/method.cc:178
 msgid "<standard error>"
 msgstr ""
 
-#: dselect/method.cc:186
+#: dselect/method.cc:181
 msgid "error reading acknowledgement of program failure message"
 msgstr ""
 
-#: dselect/method.cc:217
+#: dselect/method.cc:212
 msgid "update available list script"
 msgstr ""
 
-#: dselect/method.cc:221
+#: dselect/method.cc:216
 msgid "installation script"
 msgstr ""
 
-#: dselect/method.cc:269
+#: dselect/method.cc:264
 msgid "query/setup script"
 msgstr ""
 
-#: dselect/methparse.cc:54
+#: dselect/methparse.cc:53
 #, c-format
 msgid "syntax error in method options file `%.250s' -- %s"
 msgstr ""
 
-#: dselect/methparse.cc:59
+#: dselect/methparse.cc:58
 #, c-format
 msgid "error reading options file `%.250s'"
 msgstr ""
 
-#: dselect/methparse.cc:87
+#: dselect/methparse.cc:86
 #, c-format
 msgid "unable to read `%.250s' directory for reading methods"
 msgstr ""
 
-#: dselect/methparse.cc:103
+#: dselect/methparse.cc:102
 #, c-format
 msgid "method `%.250s' has name that is too long (%d > %d characters)"
 msgstr ""
 
-#: dselect/methparse.cc:114
+#: dselect/methparse.cc:113
 #, c-format
 msgid "unable to access method script `%.250s'"
 msgstr ""
 
-#: dselect/methparse.cc:120
+#: dselect/methparse.cc:119
 #, c-format
 msgid "unable to read method options file `%.250s'"
 msgstr ""
 
-#: dselect/methparse.cc:143
+#: dselect/methparse.cc:142
 msgid "non-digit where digit wanted"
 msgstr ""
 
-#: dselect/methparse.cc:146
+#: dselect/methparse.cc:145
 msgid "EOF in index string"
 msgstr ""
 
-#: dselect/methparse.cc:149
+#: dselect/methparse.cc:148
 msgid "index string too long"
 msgstr ""
 
-#: dselect/methparse.cc:152
+#: dselect/methparse.cc:151
 msgid "newline before option name start"
 msgstr ""
 
-#: dselect/methparse.cc:154
+#: dselect/methparse.cc:153
 msgid "EOF before option name start"
 msgstr ""
 
-#: dselect/methparse.cc:158
+#: dselect/methparse.cc:157
 msgid "nonalpha where option name start wanted"
 msgstr ""
 
-#: dselect/methparse.cc:160
+#: dselect/methparse.cc:159
 msgid "non-alphanum in option name"
 msgstr ""
 
-#: dselect/methparse.cc:163
+#: dselect/methparse.cc:162
 msgid "EOF in option name"
 msgstr ""
 
-#: dselect/methparse.cc:168
+#: dselect/methparse.cc:167
 msgid "newline before summary"
 msgstr ""
 
-#: dselect/methparse.cc:170
+#: dselect/methparse.cc:169
 msgid "EOF before summary"
 msgstr ""
 
-#: dselect/methparse.cc:176
+#: dselect/methparse.cc:175
 msgid "EOF in summary - missing newline"
 msgstr ""
 
-#: dselect/methparse.cc:186
+#: dselect/methparse.cc:185
 #, c-format
 msgid "unable to open option description file `%.250s'"
 msgstr ""
 
-#: dselect/methparse.cc:190
+#: dselect/methparse.cc:189
 #, c-format
 msgid "unable to stat option description file `%.250s'"
 msgstr ""
 
-#: dselect/methparse.cc:194
+#: dselect/methparse.cc:193
 #, c-format
 msgid "failed to read option description file `%.250s'"
 msgstr ""
 
-#: dselect/methparse.cc:197
+#: dselect/methparse.cc:196
 #, c-format
 msgid "error during read of option description file `%.250s'"
 msgstr ""
 
-#: dselect/methparse.cc:220
+#: dselect/methparse.cc:219
 #, c-format
 msgid "error during read of method options file `%.250s'"
 msgstr ""
 
-#: dselect/methparse.cc:248
+#: dselect/methparse.cc:247
 #, c-format
 msgid "unable to open current option file `%.250s'"
 msgstr ""
 
-#: dselect/methparse.cc:290
+#: dselect/methparse.cc:289
 #, c-format
 msgid "unable to open new option file `%.250s'"
 msgstr ""
 
-#: dselect/methparse.cc:293
+#: dselect/methparse.cc:292
 #, c-format
 msgid "unable to write new option to `%.250s'"
 msgstr ""
 
-#: dselect/methparse.cc:296
+#: dselect/methparse.cc:295
 #, c-format
 msgid "unable to close new option file `%.250s'"
 msgstr ""
 
-#: dselect/methparse.cc:298
+#: dselect/methparse.cc:297
 #, c-format
 msgid "unable to install new option as `%.250s'"
 msgstr ""
 
-#: dselect/pkgdisplay.cc:38
+#: dselect/pkgdisplay.cc:36
 msgid "new package"
 msgstr ""
 
-#: dselect/pkgdisplay.cc:39
+#: dselect/pkgdisplay.cc:37
 msgid "install"
 msgstr ""
 
-#: dselect/pkgdisplay.cc:40
+#: dselect/pkgdisplay.cc:38
 msgid "hold"
 msgstr ""
 
-#: dselect/pkgdisplay.cc:41
+#: dselect/pkgdisplay.cc:39
 msgid "remove"
 msgstr ""
 
-#: dselect/pkgdisplay.cc:42
+#: dselect/pkgdisplay.cc:40
 msgid "purge"
 msgstr ""
 
-#: dselect/pkgdisplay.cc:48
+#: dselect/pkgdisplay.cc:46
 msgid " "
 msgstr ""
 
-#: dselect/pkgdisplay.cc:49
+#: dselect/pkgdisplay.cc:47
 msgid "REINSTALL"
 msgstr ""
 
-#: dselect/pkgdisplay.cc:52
+#: dselect/pkgdisplay.cc:50
 msgid "not installed"
 msgstr ""
 
-#: dselect/pkgdisplay.cc:53
+#: dselect/pkgdisplay.cc:51
 msgid "removed (configs remain)"
 msgstr ""
 
-#: dselect/pkgdisplay.cc:54
+#: dselect/pkgdisplay.cc:52
 msgid "half installed"
 msgstr ""
 
-#: dselect/pkgdisplay.cc:55
+#: dselect/pkgdisplay.cc:53
 msgid "unpacked (not set up)"
 msgstr ""
 
-#: dselect/pkgdisplay.cc:56
+#: dselect/pkgdisplay.cc:54
 msgid "failed config"
 msgstr ""
 
-#: dselect/pkgdisplay.cc:57
+#: dselect/pkgdisplay.cc:55
 msgid "awaiting trigger processing"
 msgstr ""
 
-#: dselect/pkgdisplay.cc:58
+#: dselect/pkgdisplay.cc:56
 msgid "triggered"
 msgstr ""
 
-#: dselect/pkgdisplay.cc:59
+#: dselect/pkgdisplay.cc:57
 msgid "installed"
 msgstr ""
 
-#: dselect/pkgdisplay.cc:62
+#: dselect/pkgdisplay.cc:60
 msgid "Required"
 msgstr ""
 
-#: dselect/pkgdisplay.cc:63
+#: dselect/pkgdisplay.cc:61
 msgid "Important"
 msgstr ""
 
-#: dselect/pkgdisplay.cc:64
+#: dselect/pkgdisplay.cc:62
 msgid "Standard"
 msgstr ""
 
-#: dselect/pkgdisplay.cc:65
+#: dselect/pkgdisplay.cc:63
 msgid "Optional"
 msgstr ""
 
-#: dselect/pkgdisplay.cc:66
+#: dselect/pkgdisplay.cc:64
 msgid "Extra"
 msgstr ""
 
-#: dselect/pkgdisplay.cc:67
+#: dselect/pkgdisplay.cc:65
 msgid "!Bug!"
 msgstr ""
 
-#: dselect/pkgdisplay.cc:68
+#: dselect/pkgdisplay.cc:66
 msgid "Unclassified"
 msgstr ""
 
-#: dselect/pkgdisplay.cc:71
+#: dselect/pkgdisplay.cc:69
 msgid "suggests"
 msgstr ""
 
-#: dselect/pkgdisplay.cc:72
+#: dselect/pkgdisplay.cc:70
 msgid "recommends"
 msgstr ""
 
-#: dselect/pkgdisplay.cc:73
+#: dselect/pkgdisplay.cc:71
 msgid "depends on"
 msgstr ""
 
-#: dselect/pkgdisplay.cc:74
+#: dselect/pkgdisplay.cc:72
 msgid "pre-depends on"
 msgstr ""
 
-#: dselect/pkgdisplay.cc:75
+#: dselect/pkgdisplay.cc:73
 msgid "breaks"
 msgstr ""
 
-#: dselect/pkgdisplay.cc:76
+#: dselect/pkgdisplay.cc:74
 msgid "conflicts with"
 msgstr ""
 
-#: dselect/pkgdisplay.cc:77
+#: dselect/pkgdisplay.cc:75
 msgid "provides"
 msgstr ""
 
-#: dselect/pkgdisplay.cc:78
+#: dselect/pkgdisplay.cc:76
 msgid "replaces"
 msgstr ""
 
-#: dselect/pkgdisplay.cc:79
+#: dselect/pkgdisplay.cc:77
 msgid "enhances"
 msgstr ""
 
-#: dselect/pkgdisplay.cc:82
+#: dselect/pkgdisplay.cc:80
 msgid "Req"
 msgstr ""
 
-#: dselect/pkgdisplay.cc:83
+#: dselect/pkgdisplay.cc:81
 msgid "Imp"
 msgstr ""
 
-#: dselect/pkgdisplay.cc:84
+#: dselect/pkgdisplay.cc:82
 msgid "Std"
 msgstr ""
 
-#: dselect/pkgdisplay.cc:85
+#: dselect/pkgdisplay.cc:83
 msgid "Opt"
 msgstr ""
 
-#: dselect/pkgdisplay.cc:86
+#: dselect/pkgdisplay.cc:84
 msgid "Xtr"
 msgstr ""
 
-#: dselect/pkgdisplay.cc:87
+#: dselect/pkgdisplay.cc:85
 msgid "bUG"
 msgstr ""
 
-#: dselect/pkgdisplay.cc:88
+#: dselect/pkgdisplay.cc:86
 msgid "?"
 msgstr ""
 
-#: dselect/pkgdisplay.cc:96 dselect/pkgdisplay.cc:116
+#: dselect/pkgdisplay.cc:94 dselect/pkgdisplay.cc:114
 msgid "Broken"
 msgstr ""
 
-#: dselect/pkgdisplay.cc:97
+#: dselect/pkgdisplay.cc:95
 msgid "New"
 msgstr ""
 
-#: dselect/pkgdisplay.cc:98
+#: dselect/pkgdisplay.cc:96
 msgid "Updated"
 msgstr ""
 
-#: dselect/pkgdisplay.cc:99
+#: dselect/pkgdisplay.cc:97
 msgid "Obsolete/local"
 msgstr ""
 
-#: dselect/pkgdisplay.cc:100
+#: dselect/pkgdisplay.cc:98
 msgid "Up-to-date"
 msgstr ""
 
-#: dselect/pkgdisplay.cc:101
+#: dselect/pkgdisplay.cc:99
 msgid "Available"
 msgstr ""
 
-#: dselect/pkgdisplay.cc:102 dselect/pkgdisplay.cc:118
+#: dselect/pkgdisplay.cc:100 dselect/pkgdisplay.cc:116
 msgid "Removed"
 msgstr ""
 
-#: dselect/pkgdisplay.cc:103 dselect/pkgdisplay.cc:112
+#: dselect/pkgdisplay.cc:101 dselect/pkgdisplay.cc:110
 msgid "Brokenly installed packages"
 msgstr ""
 
-#: dselect/pkgdisplay.cc:104
+#: dselect/pkgdisplay.cc:102
 msgid "Newly available packages"
 msgstr ""
 
-#: dselect/pkgdisplay.cc:105
+#: dselect/pkgdisplay.cc:103
 msgid "Updated packages (newer version is available)"
 msgstr ""
 
-#: dselect/pkgdisplay.cc:106
+#: dselect/pkgdisplay.cc:104
 msgid "Obsolete and local packages present on system"
 msgstr ""
 
-#: dselect/pkgdisplay.cc:107
+#: dselect/pkgdisplay.cc:105
 msgid "Up to date installed packages"
 msgstr ""
 
-#: dselect/pkgdisplay.cc:108
+#: dselect/pkgdisplay.cc:106
 msgid "Available packages (not currently installed)"
 msgstr ""
 
-#: dselect/pkgdisplay.cc:109
+#: dselect/pkgdisplay.cc:107
 msgid "Removed and no longer available packages"
 msgstr ""
 
-#: dselect/pkgdisplay.cc:113
+#: dselect/pkgdisplay.cc:111
 msgid "Installed packages"
 msgstr ""
 
-#: dselect/pkgdisplay.cc:114
+#: dselect/pkgdisplay.cc:112
 msgid "Removed packages (configuration still present)"
 msgstr ""
 
-#: dselect/pkgdisplay.cc:115
+#: dselect/pkgdisplay.cc:113
 msgid "Purged packages and those never installed"
 msgstr ""
 
-#: dselect/pkgdisplay.cc:117
+#: dselect/pkgdisplay.cc:115
 msgid "Installed"
 msgstr ""
 
-#: dselect/pkgdisplay.cc:119
+#: dselect/pkgdisplay.cc:117
 msgid "Purged"
 msgstr ""
 
-#: dselect/pkgdisplay.cc:199
+#: dselect/pkgdisplay.cc:197
 msgid "dselect - recursive package listing"
 msgstr ""
 
-#: dselect/pkgdisplay.cc:200
+#: dselect/pkgdisplay.cc:198
 msgid "dselect - inspection of package states"
 msgstr ""
 
-#: dselect/pkgdisplay.cc:201
+#: dselect/pkgdisplay.cc:199
 msgid "dselect - main package listing"
 msgstr ""
 
-#: dselect/pkgdisplay.cc:209
+#: dselect/pkgdisplay.cc:207
 msgid " (by section)"
 msgstr ""
 
-#: dselect/pkgdisplay.cc:212
+#: dselect/pkgdisplay.cc:210
 msgid " (avail., section)"
 msgstr ""
 
-#: dselect/pkgdisplay.cc:215
+#: dselect/pkgdisplay.cc:213
 msgid " (status, section)"
 msgstr ""
 
-#: dselect/pkgdisplay.cc:224
+#: dselect/pkgdisplay.cc:222
 msgid " (by priority)"
 msgstr ""
 
-#: dselect/pkgdisplay.cc:227
+#: dselect/pkgdisplay.cc:225
 msgid " (avail., priority)"
 msgstr ""
 
-#: dselect/pkgdisplay.cc:230
+#: dselect/pkgdisplay.cc:228
 msgid " (status, priority)"
 msgstr ""
 
-#: dselect/pkgdisplay.cc:239 dselect/pkgdisplay.cc:251
+#: dselect/pkgdisplay.cc:237 dselect/pkgdisplay.cc:249
 msgid " (alphabetically)"
 msgstr ""
 
-#: dselect/pkgdisplay.cc:242
+#: dselect/pkgdisplay.cc:240
 msgid " (by availability)"
 msgstr ""
 
-#: dselect/pkgdisplay.cc:245
+#: dselect/pkgdisplay.cc:243
 msgid " (by status)"
 msgstr ""
 
-#: dselect/pkgdisplay.cc:259
+#: dselect/pkgdisplay.cc:257
 msgid " mark:+/=/- terse:v help:?"
 msgstr ""
 
-#: dselect/pkgdisplay.cc:260
+#: dselect/pkgdisplay.cc:258
 msgid " mark:+/=/- verbose:v help:?"
 msgstr ""
 
-#: dselect/pkgdisplay.cc:261
+#: dselect/pkgdisplay.cc:259
 msgid " terse:v help:?"
 msgstr ""
 
-#: dselect/pkgdisplay.cc:262
+#: dselect/pkgdisplay.cc:260
 msgid " verbose:v help:?"
 msgstr ""
 
-#: dselect/pkginfo.cc:82
+#: dselect/pkginfo.cc:80
 msgid ""
 "The line you have highlighted represents many packages; if you ask to "
 "install, remove, hold, etc. it you will affect all the packages which match "
@@ -1314,116 +1304,116 @@ msgid ""
 "opportunity to mark packages in different kinds of groups."
 msgstr ""
 
-#: dselect/pkginfo.cc:95
+#: dselect/pkginfo.cc:93
 msgid "Interrelationships"
 msgstr ""
 
-#: dselect/pkginfo.cc:114
+#: dselect/pkginfo.cc:112
 msgid "No description available."
 msgstr ""
 
-#: dselect/pkginfo.cc:132
+#: dselect/pkginfo.cc:130
 msgid "Installed control file information"
 msgstr ""
 
-#: dselect/pkginfo.cc:148
+#: dselect/pkginfo.cc:146
 msgid "Available control file information"
 msgstr ""
 
-#: dselect/pkglist.cc:419
+#: dselect/pkglist.cc:417
 msgid "There are no packages."
 msgstr ""
 
-#: dselect/pkglist.cc:506
+#: dselect/pkglist.cc:504
 msgid "invalid search option given"
 msgstr ""
 
-#: dselect/pkglist.cc:520
+#: dselect/pkglist.cc:518
 msgid "error in regular expression"
 msgstr ""
 
-#: dselect/pkgsublist.cc:107
+#: dselect/pkgsublist.cc:105
 msgid " does not appear to be available\n"
 msgstr ""
 
-#: dselect/pkgsublist.cc:124
+#: dselect/pkgsublist.cc:122
 msgid " or "
 msgstr ""
 
-#: dselect/pkgtop.cc:59
+#: dselect/pkgtop.cc:57
 msgid "All"
 msgstr ""
 
-#: dselect/pkgtop.cc:81
+#: dselect/pkgtop.cc:79
 msgid "All packages"
 msgstr ""
 
-#: dselect/pkgtop.cc:85
+#: dselect/pkgtop.cc:83
 #, c-format
 msgid "%s packages without a section"
 msgstr ""
 
-#: dselect/pkgtop.cc:87
+#: dselect/pkgtop.cc:85
 #, c-format
 msgid "%s packages in section %s"
 msgstr ""
 
-#: dselect/pkgtop.cc:93
+#: dselect/pkgtop.cc:91
 #, c-format
 msgid "%s %s packages"
 msgstr ""
 
-#: dselect/pkgtop.cc:97
+#: dselect/pkgtop.cc:95
 #, c-format
 msgid "%s %s packages without a section"
 msgstr ""
 
-#: dselect/pkgtop.cc:99
+#: dselect/pkgtop.cc:97
 #, c-format
 msgid "%s %s packages in section %s"
 msgstr ""
 
-#: dselect/pkgtop.cc:120
+#: dselect/pkgtop.cc:118
 #, c-format
 msgid "%-*s %s%s%s;  %s (was: %s).  %s"
 msgstr ""
 
-#: dselect/pkgtop.cc:275
+#: dselect/pkgtop.cc:273
 msgid "Error"
 msgstr ""
 
-#: dselect/pkgtop.cc:279
+#: dselect/pkgtop.cc:277
 msgid "Installed?"
 msgstr ""
 
-#: dselect/pkgtop.cc:283
+#: dselect/pkgtop.cc:281
 msgid "Old mark"
 msgstr ""
 
-#: dselect/pkgtop.cc:287
+#: dselect/pkgtop.cc:285
 msgid "Marked for"
 msgstr ""
 
-#: dselect/pkgtop.cc:290
+#: dselect/pkgtop.cc:288
 msgid "EIOM"
 msgstr ""
 
-#: dselect/pkgtop.cc:292
+#: dselect/pkgtop.cc:290
 msgid "Section"
 msgstr ""
 
-#: dselect/pkgtop.cc:293
+#: dselect/pkgtop.cc:291
 msgid "Priority"
 msgstr ""
 
-#: dselect/pkgtop.cc:294
+#: dselect/pkgtop.cc:292
 msgid "Package"
 msgstr ""
 
-#: dselect/pkgtop.cc:298
+#: dselect/pkgtop.cc:296
 msgid "Inst.ver"
 msgstr ""
 
-#: dselect/pkgtop.cc:301
+#: dselect/pkgtop.cc:299
 msgid "Avail.ver"
 msgstr ""