Regenerate .pot files and merge .po files with them

31 files changed, 11606 insertions, 10067 deletions

diff --git a/dselect/po/bs.po b/dselect/po/bs.po
index 082788bdc..03a92493f 100644
--- a/dselect/po/bs.po
+++ b/dselect/po/bs.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dselect 1.13\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2014-12-23 18:12+0100\n"
+"POT-Creation-Date: 2015-04-06 09:37+0200\n"
 "PO-Revision-Date: 2006-02-17 08:55+0200\n"
 "Last-Translator: Safir Šećerović <sapphire@linux.org.ba>\n"
 "Language-Team: Bosnian <lokal@linux.org.ba>\n"
@@ -16,266 +16,266 @@ msgstr ""
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: dselect/basecmds.cc:125
+#: dselect/basecmds.cc
 msgid "Search for ? "
 msgstr ""
 
-#: dselect/basecmds.cc:149
+#: dselect/basecmds.cc
 msgid "Error: "
 msgstr "Greška:"
 
-#: dselect/basecmds.cc:180
+#: dselect/basecmds.cc
 msgid "Help: "
 msgstr "Pomoć:"
 
-#: dselect/basecmds.cc:186
+#: dselect/basecmds.cc
 msgid "Press ? for help menu, . for next topic, <space> to exit help."
 msgstr ""
 
-#: dselect/basecmds.cc:193
+#: dselect/basecmds.cc
 msgid "Help information is available under the following topics:"
 msgstr ""
 
-#: dselect/basecmds.cc:201
+#: dselect/basecmds.cc
 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:207
+#: dselect/basecmds.cc
 msgid "error reading keyboard in help"
 msgstr ""
 
-#: dselect/baselist.cc:60
+#: dselect/baselist.cc
 msgid "ioctl(TIOCGWINSZ) failed"
 msgstr ""
 
-#: dselect/baselist.cc:63
+#: dselect/baselist.cc
 msgid "doupdate in SIGWINCH handler failed"
 msgstr ""
 
-#: dselect/baselist.cc:72
+#: dselect/baselist.cc
 msgid "failed to restore old SIGWINCH sigact"
 msgstr ""
 
-#: dselect/baselist.cc:75
+#: dselect/baselist.cc
 msgid "failed to restore old signal mask"
 msgstr ""
 
-#: dselect/baselist.cc:86
+#: dselect/baselist.cc
 msgid "failed to get old signal mask"
 msgstr ""
 
-#: dselect/baselist.cc:88
+#: dselect/baselist.cc
 msgid "failed to get old SIGWINCH sigact"
 msgstr ""
 
-#: dselect/baselist.cc:93
+#: dselect/baselist.cc
 msgid "failed to block SIGWINCH"
 msgstr ""
 
-#: dselect/baselist.cc:99
+#: dselect/baselist.cc
 msgid "failed to set new SIGWINCH sigact"
 msgstr ""
 
-#: dselect/baselist.cc:174
+#: dselect/baselist.cc
 msgid "failed to allocate colour pair"
 msgstr ""
 
-#: dselect/baselist.cc:203
+#: dselect/baselist.cc
 msgid "failed to create title window"
 msgstr ""
 
-#: dselect/baselist.cc:207
+#: dselect/baselist.cc
 msgid "failed to create whatinfo window"
 msgstr ""
 
-#: dselect/baselist.cc:211
+#: dselect/baselist.cc
 msgid "failed to create baselist pad"
 msgstr ""
 
-#: dselect/baselist.cc:214
+#: dselect/baselist.cc
 msgid "failed to create heading pad"
 msgstr ""
 
-#: dselect/baselist.cc:218
+#: dselect/baselist.cc
 msgid "failed to create thisstate pad"
 msgstr ""
 
-#: dselect/baselist.cc:222
+#: dselect/baselist.cc
 msgid "failed to create info pad"
 msgstr ""
 
-#: dselect/baselist.cc:227
+#: dselect/baselist.cc
 msgid "failed to create query window"
 msgstr ""
 
-#: dselect/baselist.cc:298
+#: dselect/baselist.cc
 msgid "Keybindings"
 msgstr ""
 
-#: dselect/baselist.cc:347
+#: dselect/baselist.cc
 #, c-format
 msgid "  -- %d%%, press "
 msgstr ""
 
-#: dselect/baselist.cc:350
+#: dselect/baselist.cc
 #, c-format
 msgid "%s for more"
 msgstr ""
 
-#: dselect/baselist.cc:354
+#: dselect/baselist.cc
 #, c-format
 msgid "%s to go back"
 msgstr ""
 
-#: dselect/bindings.cc:78
+#: dselect/bindings.cc
 msgid "[not bound]"
 msgstr ""
 
-#: dselect/bindings.cc:82
+#: dselect/bindings.cc
 #, c-format
 msgid "[unk: %d]"
 msgstr ""
 
-#: dselect/bindings.cc:141
+#: dselect/bindings.cc
 msgid "Scroll onwards through help/information"
 msgstr ""
 
-#: dselect/bindings.cc:142
+#: dselect/bindings.cc
 msgid "Scroll backwards through help/information"
 msgstr ""
 
-#: dselect/bindings.cc:143
+#: dselect/bindings.cc
 msgid "Move up"
 msgstr "Pomjeri gore"
 
-#: dselect/bindings.cc:144
+#: dselect/bindings.cc
 msgid "Move down"
 msgstr "Pomjeri dole"
 
-#: dselect/bindings.cc:145
+#: dselect/bindings.cc
 msgid "Go to top of list"
 msgstr "Idi na vrh liste"
 
-#: dselect/bindings.cc:146
+#: dselect/bindings.cc
 msgid "Go to end of list"
 msgstr "Idi na kraj liste"
 
-#: dselect/bindings.cc:147
+#: dselect/bindings.cc
 msgid "Request help (cycle through help screens)"
 msgstr ""
 
-#: dselect/bindings.cc:148
+#: dselect/bindings.cc
 msgid "Cycle through information displays"
 msgstr ""
 
-#: dselect/bindings.cc:149
+#: dselect/bindings.cc
 msgid "Redraw display"
 msgstr ""
 
-#: dselect/bindings.cc:150
+#: dselect/bindings.cc
 msgid "Scroll onwards through list by 1 line"
 msgstr ""
 
-#: dselect/bindings.cc:151
+#: dselect/bindings.cc
 msgid "Scroll backwards through list by 1 line"
 msgstr ""
 
-#: dselect/bindings.cc:152
+#: dselect/bindings.cc
 msgid "Scroll onwards through help/information by 1 line"
 msgstr ""
 
-#: dselect/bindings.cc:153
+#: dselect/bindings.cc
 msgid "Scroll backwards through help/information by 1 line"
 msgstr ""
 
-#: dselect/bindings.cc:154
+#: dselect/bindings.cc
 msgid "Scroll onwards through list"
 msgstr ""
 
-#: dselect/bindings.cc:155
+#: dselect/bindings.cc
 msgid "Scroll backwards through list"
 msgstr ""
 
-#: dselect/bindings.cc:158
+#: dselect/bindings.cc
 msgid "Mark package(s) for installation"
 msgstr ""
 
-#: dselect/bindings.cc:159
+#: dselect/bindings.cc
 msgid "Mark package(s) for deinstallation"
 msgstr ""
 
-#: dselect/bindings.cc:160
+#: dselect/bindings.cc
 msgid "Mark package(s) for deinstall and purge"
 msgstr ""
 
-#: dselect/bindings.cc:161
+#: dselect/bindings.cc
 msgid "Make highlight more specific"
 msgstr ""
 
-#: dselect/bindings.cc:162
+#: dselect/bindings.cc
 msgid "Make highlight less specific"
 msgstr ""
 
-#: dselect/bindings.cc:163
+#: dselect/bindings.cc
 msgid "Search for a package whose name contains a string"
 msgstr ""
 
-#: dselect/bindings.cc:164
+#: dselect/bindings.cc
 msgid "Repeat last search"
 msgstr ""
 
-#: dselect/bindings.cc:165
+#: dselect/bindings.cc
 msgid "Swap sort order priority/section"
 msgstr ""
 
-#: dselect/bindings.cc:166
+#: dselect/bindings.cc
 msgid "Quit, confirming, and checking dependencies"
 msgstr ""
 
-#: dselect/bindings.cc:167
+#: dselect/bindings.cc
 msgid "Quit, confirming without check"
 msgstr ""
 
-#: dselect/bindings.cc:168
+#: dselect/bindings.cc
 msgid "Quit, rejecting conflict/dependency suggestions"
 msgstr ""
 
-#: dselect/bindings.cc:169
+#: dselect/bindings.cc
 msgid "Abort - quit without making changes"
 msgstr ""
 
-#: dselect/bindings.cc:170
+#: dselect/bindings.cc
 msgid "Revert to old state for all packages"
 msgstr ""
 
-#: dselect/bindings.cc:171
+#: dselect/bindings.cc
 msgid "Revert to suggested state for all packages"
 msgstr ""
 
-#: dselect/bindings.cc:172
+#: dselect/bindings.cc
 msgid "Revert to directly requested state for all packages"
 msgstr ""
 
-#: dselect/bindings.cc:173
+#: dselect/bindings.cc
 #, fuzzy
 msgid "Revert to currently installed state for all packages"
 msgstr "Nepravilno instalirani paketi"
 
-#: dselect/bindings.cc:176
+#: dselect/bindings.cc
 msgid "Select currently-highlighted access method"
 msgstr ""
 
-#: dselect/bindings.cc:177
+#: dselect/bindings.cc
 msgid "Quit without changing selected access method"
 msgstr ""
 
-#: dselect/helpmsgs.cc:29
+#: dselect/helpmsgs.cc
 msgid "Keystrokes"
 msgstr ""
 
-#: dselect/helpmsgs.cc:29
+#: dselect/helpmsgs.cc
 msgid ""
 "Motion keys: Next/Previous, Top/End, Up/Down, Backwards/Forwards:\n"
 "  j, Down-arrow         k, Up-arrow             move highlight\n"
@@ -307,11 +307,11 @@ msgid ""
 "   D     set all to Directly requested state  n, \\  repeat last search\n"
 msgstr ""
 
-#: dselect/helpmsgs.cc:55
+#: dselect/helpmsgs.cc
 msgid "Introduction to package selections"
 msgstr ""
 
-#: dselect/helpmsgs.cc:55
+#: dselect/helpmsgs.cc
 msgid ""
 "Welcome to dselect's main package listing.\n"
 "\n"
@@ -342,11 +342,11 @@ msgid ""
 "Press <space> to leave help and enter the list now.\n"
 msgstr ""
 
-#: dselect/helpmsgs.cc:80
+#: dselect/helpmsgs.cc
 msgid "Introduction to read-only package list browser"
 msgstr ""
 
-#: dselect/helpmsgs.cc:80
+#: dselect/helpmsgs.cc
 msgid ""
 "Welcome to dselect's main package listing.\n"
 "\n"
@@ -367,11 +367,11 @@ msgid ""
 "Press <space> to leave help and enter the list now.\n"
 msgstr ""
 
-#: dselect/helpmsgs.cc:99
+#: dselect/helpmsgs.cc
 msgid "Introduction to conflict/dependency resolution sub-list"
 msgstr ""
 
-#: dselect/helpmsgs.cc:99
+#: dselect/helpmsgs.cc
 msgid ""
 "Dependency/conflict resolution - introduction.\n"
 "\n"
@@ -406,11 +406,11 @@ msgid ""
 "help.\n"
 msgstr ""
 
-#: dselect/helpmsgs.cc:125
+#: dselect/helpmsgs.cc
 msgid "Display, part 1: package listing and status chars"
 msgstr ""
 
-#: dselect/helpmsgs.cc:125
+#: dselect/helpmsgs.cc
 msgid ""
 "The top half of the screen shows a list of packages.  For each package you "
 "see\n"
@@ -443,11 +443,11 @@ msgid ""
 "description.\n"
 msgstr ""
 
-#: dselect/helpmsgs.cc:152
+#: dselect/helpmsgs.cc
 msgid "Display, part 2: list highlight; information display"
 msgstr ""
 
-#: dselect/helpmsgs.cc:152
+#: dselect/helpmsgs.cc
 msgid ""
 "* Highlight: One line in the package list will be highlighted.  It "
 "indicates\n"
@@ -474,11 +474,11 @@ msgid ""
 "  information display or expand it to use almost all of the screen.\n"
 msgstr ""
 
-#: dselect/helpmsgs.cc:176
+#: dselect/helpmsgs.cc
 msgid "Introduction to method selection display"
 msgstr ""
 
-#: dselect/helpmsgs.cc:176
+#: dselect/helpmsgs.cc
 msgid ""
 "dselect and dpkg can do automatic installation, loading the package files to "
 "be\n"
@@ -502,11 +502,11 @@ msgid ""
 "menu reachable by pressing `?'.\n"
 msgstr ""
 
-#: dselect/helpmsgs.cc:196
+#: dselect/helpmsgs.cc
 msgid "Keystrokes for method selection"
 msgstr ""
 
-#: dselect/helpmsgs.cc:196
+#: dselect/helpmsgs.cc
 msgid ""
 "Motion keys: Next/Previous, Top/End, Up/Down, Backwards/Forwards:\n"
 "  j, Down-arrow         k, Up-arrow             move highlight\n"
@@ -531,104 +531,104 @@ msgid ""
 "  \\                repeat last search\n"
 msgstr ""
 
-#: dselect/main.cc:63
+#: dselect/main.cc
 msgid "Type dselect --help for help."
 msgstr "Ukucajte dselect --help za pomoć."
 
-#: dselect/main.cc:145
+#: dselect/main.cc
 msgid "a"
 msgstr "p"
 
-#: dselect/main.cc:145
+#: dselect/main.cc
 msgid "[A]ccess"
 msgstr "[P]ristup"
 
-#: dselect/main.cc:145
+#: dselect/main.cc
 msgid "Choose the access method to use."
 msgstr "Izaberite metod pristupa koji će se korisiti."
 
-#: dselect/main.cc:146
+#: dselect/main.cc
 msgid "u"
 msgstr "a"
 
-#: dselect/main.cc:146
+#: dselect/main.cc
 msgid "[U]pdate"
 msgstr "[A]žuriraj"
 
-#: dselect/main.cc:146
+#: dselect/main.cc
 msgid "Update list of available packages, if possible."
 msgstr "Ažuriraj listu dostupnih paketa, po mogućnosti."
 
-#: dselect/main.cc:147
+#: dselect/main.cc
 msgid "s"
 msgstr "o"
 
-#: dselect/main.cc:147
+#: dselect/main.cc
 msgid "[S]elect"
 msgstr "[O]dabir"
 
-#: dselect/main.cc:147
+#: dselect/main.cc
 msgid "Request which packages you want on your system."
 msgstr "Odaberite koje pakete želite na vašem sistemu."
 
-#: dselect/main.cc:148
+#: dselect/main.cc
 msgid "i"
 msgstr "i"
 
-#: dselect/main.cc:148
+#: dselect/main.cc
 msgid "[I]nstall"
 msgstr "[I]nstaliraj"
 
-#: dselect/main.cc:148
+#: dselect/main.cc
 msgid "Install and upgrade wanted packages."
 msgstr "Instaliraj i nadogradi željene pakete."
 
-#: dselect/main.cc:149
+#: dselect/main.cc
 msgid "c"
 msgstr "d"
 
-#: dselect/main.cc:149
+#: dselect/main.cc
 msgid "[C]onfig"
 msgstr "Po[d]esi"
 
-#: dselect/main.cc:149
+#: dselect/main.cc
 msgid "Configure any packages that are unconfigured."
 msgstr "Podesi sve pakete koji nisu podešeni."
 
-#: dselect/main.cc:150
+#: dselect/main.cc
 msgid "r"
 msgstr "u"
 
-#: dselect/main.cc:150
+#: dselect/main.cc
 msgid "[R]emove"
 msgstr "[U]kloni"
 
-#: dselect/main.cc:150
+#: dselect/main.cc
 msgid "Remove unwanted software."
 msgstr "Ukloni neželjeni software"
 
-#: dselect/main.cc:151
+#: dselect/main.cc
 msgid "q"
 msgstr "z"
 
-#: dselect/main.cc:151
+#: dselect/main.cc
 msgid "[Q]uit"
 msgstr "I[z]ađi"
 
-#: dselect/main.cc:151
+#: dselect/main.cc
 msgid "Quit dselect."
 msgstr "Izađi iz dselect programa."
 
-#: dselect/main.cc:152
+#: dselect/main.cc
 msgid "menu"
 msgstr "meni"
 
-#: dselect/main.cc:157
+#: dselect/main.cc
 #, fuzzy, c-format
 msgid "Debian `%s' package handling frontend version %s.\n"
 msgstr "Debianov `%s' program za rukovanje paketima."
 
-#: dselect/main.cc:160
+#: dselect/main.cc
 #, fuzzy
 msgid ""
 "This is free software; see the GNU General Public License version 2 or\n"
@@ -641,104 +641,110 @@ msgstr ""
 "ili kasniju za uslove kopiranja.  NEMA garancije.  Pogledajte\n"
 "dselect --licence za detalje.\n"
 
-#: dselect/main.cc:169 dselect/main.cc:217
+#: dselect/main.cc
 msgid "<standard output>"
 msgstr ""
 
-#: dselect/main.cc:180
+#: dselect/main.cc
 #, c-format
 msgid ""
-"Usage: %s [<option> ...] [<action> ...]\n"
+"Usage: %s [<option>...] [<command>...]\n"
 "\n"
 msgstr ""
 
-#: dselect/main.cc:184
+#: dselect/main.cc
+#, c-format
+msgid "Commands:\n"
+msgstr ""
+
+#: dselect/main.cc
 #, c-format
 msgid ""
 "Options:\n"
-"  --admindir <directory>     Use <directory> instead of %s.\n"
-"  --expert                   Turn on expert mode.\n"
-"  --debug <file> | -D<file>  Turn on debugging, sending output to <file>.\n"
-"  --colour | --color screenpart:[foreground],[background][:attr[+attr+...]]\n"
-"                             Configure screen colours.\n"
-"\n"
+"      --admindir <directory>       Use <directory> instead of %s.\n"
+"      --expert                     Turn on expert mode.\n"
+"  -D, --debug <file>               Turn on debugging, send output to "
+"<file>.\n"
+"      --color <color-spec>         Configure screen colors.\n"
+"      --colour <color-spec>        Ditto.\n"
 msgstr ""
 
-#: dselect/main.cc:193
+#: dselect/main.cc
 #, c-format
 msgid ""
-"  --help                     Show this help message.\n"
-"  --version                  Show the version.\n"
+"  -?, --help                       Show this help message.\n"
+"      --version                    Show the version.\n"
 "\n"
 msgstr ""
 
-#: dselect/main.cc:197
-#, fuzzy, c-format
-#| msgid "Section"
-msgid "Actions:\n"
-msgstr "Sekcija"
+#: dselect/main.cc
+#, c-format
+msgid ""
+"<color-spec> is <screen-part>:[<foreground>],[<background>][:"
+"<attr>[+<attr>]...]\n"
+msgstr ""
 
-#: dselect/main.cc:202
+#: dselect/main.cc
 #, c-format
-msgid "Screenparts:\n"
+msgid "<screen-part> is:"
 msgstr ""
 
-#: dselect/main.cc:207
+#: dselect/main.cc
 #, c-format
-msgid "Colours:\n"
-msgstr "Boje:\n"
+msgid "<color> is:"
+msgstr ""
 
-#: dselect/main.cc:212
+#: dselect/main.cc
 #, c-format
-msgid "Attributes:\n"
+msgid "<attr> is:"
 msgstr ""
 
-#: dselect/main.cc:232
+#: dselect/main.cc
 #, c-format
 msgid "couldn't open debug file `%.255s'\n"
 msgstr ""
 
-#: dselect/main.cc:253
+#: dselect/main.cc
 #, c-format
 msgid "invalid %s '%s'"
 msgstr ""
 
-#: dselect/main.cc:272
+#: dselect/main.cc
 msgid "screen part"
 msgstr ""
 
-#: dselect/main.cc:278
+#: dselect/main.cc
 msgid "null colour specification"
 msgstr ""
 
-#: dselect/main.cc:286 dselect/main.cc:291
+#: dselect/main.cc
 msgid "colour"
 msgstr "boja"
 
-#: dselect/main.cc:299
+#: dselect/main.cc
 msgid "colour attribute"
 msgstr ""
 
-#: dselect/main.cc:333
+#: dselect/main.cc
 msgid "Terminal does not appear to support cursor addressing.\n"
 msgstr ""
 
-#: dselect/main.cc:335
+#: dselect/main.cc
 msgid "Terminal does not appear to support highlighting.\n"
 msgstr ""
 
-#: dselect/main.cc:337
+#: dselect/main.cc
 #, 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:340
+#: dselect/main.cc
 msgid "terminal lacks necessary features, giving up"
 msgstr ""
 
-#: dselect/main.cc:425
+#: dselect/main.cc
 msgid ""
 "\n"
 "\n"
@@ -747,70 +753,70 @@ msgid ""
 "\n"
 msgstr ""
 
-#: dselect/main.cc:430
+#: dselect/main.cc
 msgid ""
 "Copyright (C) 1994-1996 Ian Jackson.\n"
 "Copyright (C) 2000,2001 Wichert Akkerman.\n"
 msgstr ""
 
-#: dselect/main.cc:436
+#: dselect/main.cc
 msgid ""
 "\n"
 "\n"
 "Read-only access: only preview of selections is available!"
 msgstr ""
 
-#: dselect/main.cc:455
+#: dselect/main.cc
 msgid "failed to getch in main menu"
 msgstr ""
 
-#: dselect/main.cc:538
+#: dselect/main.cc
 #, c-format
 msgid "unknown action string `%.50s'"
 msgstr ""
 
-#: dselect/methlist.cc:66
+#: dselect/methlist.cc
 msgid "Abbrev."
 msgstr ""
 
-#: dselect/methlist.cc:67 dselect/pkgdisplay.cc:188 dselect/pkginfo.cc:110
+#: dselect/methlist.cc dselect/pkgdisplay.cc dselect/pkginfo.cc
 msgid "Description"
 msgstr "Opis"
 
-#: dselect/methlist.cc:73
+#: dselect/methlist.cc
 msgid "dselect - list of access methods"
 msgstr ""
 
-#: dselect/methlist.cc:82
+#: dselect/methlist.cc
 #, c-format
 msgid "Access method `%s'."
 msgstr "Metod pristupa `%s'."
 
-#: dselect/methlist.cc:161 dselect/pkglist.cc:587
+#: dselect/methlist.cc dselect/pkglist.cc
 msgid "doupdate failed"
 msgstr ""
 
-#: dselect/methlist.cc:164 dselect/pkglist.cc:590
+#: dselect/methlist.cc dselect/pkglist.cc
 msgid "failed to unblock SIGWINCH"
 msgstr ""
 
-#: dselect/methlist.cc:169 dselect/pkglist.cc:595
+#: dselect/methlist.cc dselect/pkglist.cc
 msgid "failed to re-block SIGWINCH"
 msgstr ""
 
-#: dselect/methlist.cc:170 dselect/pkglist.cc:597
+#: dselect/methlist.cc dselect/pkglist.cc
 msgid "getch failed"
 msgstr ""
 
-#: dselect/methlist.cc:187
+#: dselect/methlist.cc
 msgid "Explanation"
 msgstr ""
 
-#: dselect/methlist.cc:197
+#: dselect/methlist.cc
 msgid "No explanation available."
 msgstr ""
 
-#: dselect/method.cc:67
+#: dselect/method.cc
 #, c-format
 msgid ""
 "\n"
@@ -818,193 +824,193 @@ msgid ""
 "%s: %s\n"
 msgstr ""
 
-#: dselect/method.cc:70
+#: dselect/method.cc
 msgid ""
 "\n"
 "Press <enter> to continue."
 msgstr ""
 
-#: dselect/method.cc:82
+#: dselect/method.cc
 msgid "cannot unlock access method area"
 msgstr ""
 
-#: dselect/method.cc:96
+#: dselect/method.cc
 msgid "no access methods are available"
 msgstr ""
 
-#: dselect/method.cc:115
+#: dselect/method.cc
 msgid "requested operation requires superuser privilege"
 msgstr ""
 
-#: dselect/method.cc:118
+#: dselect/method.cc
 #, fuzzy
 #| msgid "Choose the access method to use."
 msgid "cannot open or create access method lockfile"
 msgstr "Izaberite metod pristupa koji će se korisiti."
 
-#: dselect/method.cc:125
+#: dselect/method.cc
 msgid "the access method area is already locked"
 msgstr ""
 
-#: dselect/method.cc:128
+#: dselect/method.cc
 msgid "cannot lock access method area"
 msgstr ""
 
-#: dselect/method.cc:161
+#: dselect/method.cc
 #, c-format
 msgid "Press <enter> to continue.\n"
 msgstr ""
 
-#: dselect/method.cc:162
+#: dselect/method.cc
 msgid "<standard error>"
 msgstr ""
 
-#: dselect/method.cc:165
+#: dselect/method.cc
 msgid "error reading acknowledgement of program failure message"
 msgstr ""
 
-#: dselect/method.cc:187
+#: dselect/method.cc
 msgid "no access method is selected or configured"
 msgstr ""
 
-#: dselect/method.cc:196
+#: dselect/method.cc
 msgid "update available list script"
 msgstr ""
 
-#: dselect/method.cc:200
+#: dselect/method.cc
 msgid "installation script"
 msgstr ""
 
-#: dselect/method.cc:246
+#: dselect/method.cc
 msgid "query/setup script"
 msgstr ""
 
-#: dselect/methparse.cc:53
+#: dselect/methparse.cc
 #, c-format
 msgid "syntax error in method options file `%.250s' -- %s"
 msgstr ""
 
-#: dselect/methparse.cc:59
+#: dselect/methparse.cc
 #, c-format
 msgid "error reading options file `%.250s'"
 msgstr ""
 
-#: dselect/methparse.cc:93
+#: dselect/methparse.cc
 #, c-format
 msgid "unable to read `%.250s' directory for reading methods"
 msgstr ""
 
-#: dselect/methparse.cc:109
+#: dselect/methparse.cc
 #, c-format
 msgid "method `%.250s' has name that is too long (%d > %d characters)"
 msgstr ""
 
-#: dselect/methparse.cc:120
+#: dselect/methparse.cc
 #, c-format
 msgid "unable to access method script `%.250s'"
 msgstr ""
 
-#: dselect/methparse.cc:126
+#: dselect/methparse.cc
 #, c-format
 msgid "unable to read method options file `%.250s'"
 msgstr ""
 
-#: dselect/methparse.cc:150
+#: dselect/methparse.cc
 msgid "non-digit where digit wanted"
 msgstr ""
 
-#: dselect/methparse.cc:153
-msgid "EOF in index string"
+#: dselect/methparse.cc
+msgid "end of file in index string"
 msgstr ""
 
-#: dselect/methparse.cc:156
+#: dselect/methparse.cc
 msgid "index string too long"
 msgstr ""
 
-#: dselect/methparse.cc:159
+#: dselect/methparse.cc
 msgid "newline before option name start"
 msgstr ""
 
-#: dselect/methparse.cc:161
-msgid "EOF before option name start"
+#: dselect/methparse.cc
+msgid "end of file before option name start"
 msgstr ""
 
-#: dselect/methparse.cc:165
+#: dselect/methparse.cc
 msgid "nonalpha where option name start wanted"
 msgstr ""
 
-#: dselect/methparse.cc:167
+#: dselect/methparse.cc
 msgid "non-alphanum in option name"
 msgstr ""
 
-#: dselect/methparse.cc:170
-msgid "EOF in option name"
+#: dselect/methparse.cc
+msgid "end of file in option name"
 msgstr ""
 
-#: dselect/methparse.cc:175
+#: dselect/methparse.cc
 msgid "newline before summary"
 msgstr ""
 
-#: dselect/methparse.cc:177
-msgid "EOF before summary"
+#: dselect/methparse.cc
+msgid "end of file before summary"
 msgstr ""
 
-#: dselect/methparse.cc:183
-msgid "EOF in summary - missing newline"
+#: dselect/methparse.cc
+msgid "end of file in summary - missing newline"
 msgstr ""
 
-#: dselect/methparse.cc:193
+#: dselect/methparse.cc
 #, c-format
 msgid "unable to open option description file `%.250s'"
 msgstr ""
 
-#: dselect/methparse.cc:197
+#: dselect/methparse.cc
 #, c-format
 msgid "unable to stat option description file `%.250s'"
 msgstr ""
 
-#: dselect/methparse.cc:201
+#: dselect/methparse.cc
 #, c-format
 msgid "failed to read option description file `%.250s'"
 msgstr ""
 
-#: dselect/methparse.cc:204
+#: dselect/methparse.cc
 #, c-format
 msgid "error during read of option description file `%.250s'"
 msgstr ""
 
-#: dselect/methparse.cc:227
+#: dselect/methparse.cc
 #, c-format
 msgid "error during read of method options file `%.250s'"
 msgstr ""
 
-#: dselect/methparse.cc:250
+#: dselect/methparse.cc
 #, c-format
 msgid "unable to open current option file `%.250s'"
 msgstr ""
 
-#: dselect/methparse.cc:286
+#: dselect/methparse.cc
 #, c-format
 msgid "unable to write new option to `%.250s'"
 msgstr ""
 
-#: dselect/pkgdisplay.cc:36
+#: dselect/pkgdisplay.cc
 msgid "new package"
 msgstr ""
 
-#: dselect/pkgdisplay.cc:37
+#: dselect/pkgdisplay.cc
 msgid "install"
 msgstr "instaliraj"
 
-#: dselect/pkgdisplay.cc:38
+#: dselect/pkgdisplay.cc
 msgid "hold"
 msgstr "zadrži"
 
-#: dselect/pkgdisplay.cc:39
+#: dselect/pkgdisplay.cc
 msgid "remove"
 msgstr "ukloni"
 
-#: dselect/pkgdisplay.cc:40
+#: dselect/pkgdisplay.cc
 msgid "purge"
 msgstr "očisti"
 
@@ -1012,331 +1018,325 @@ msgstr "očisti"
 #. * the empty string to store information about the translation. DO NOT
 #. * CHANGE THAT IN A TRANSLATION! The code really relies on that being
 #. * a single space.
-#: dselect/pkgdisplay.cc:47
+#: dselect/pkgdisplay.cc
 msgid " "
 msgstr ""
 
-#: dselect/pkgdisplay.cc:48
+#: dselect/pkgdisplay.cc
 msgid "REINSTALL"
 msgstr ""
 
-#: dselect/pkgdisplay.cc:51
+#: dselect/pkgdisplay.cc
 msgid "not installed"
 msgstr ""
 
-#: dselect/pkgdisplay.cc:52
+#: dselect/pkgdisplay.cc
 msgid "removed (configs remain)"
 msgstr ""
 
-#: dselect/pkgdisplay.cc:53
+#: dselect/pkgdisplay.cc
 msgid "half installed"
 msgstr ""
 
-#: dselect/pkgdisplay.cc:54
+#: dselect/pkgdisplay.cc
 msgid "unpacked (not set up)"
 msgstr ""
 
-#: dselect/pkgdisplay.cc:55
+#: dselect/pkgdisplay.cc
 msgid "half configured (config failed)"
 msgstr ""
 
-#: dselect/pkgdisplay.cc:56
+#: dselect/pkgdisplay.cc
 msgid "awaiting trigger processing"
 msgstr ""
 
-#: dselect/pkgdisplay.cc:57
+#: dselect/pkgdisplay.cc
 msgid "triggered"
 msgstr ""
 
-#: dselect/pkgdisplay.cc:58
+#: dselect/pkgdisplay.cc
 msgid "installed"
 msgstr ""
 
-#: dselect/pkgdisplay.cc:61
+#: dselect/pkgdisplay.cc
 msgid "Required"
 msgstr ""
 
-#: dselect/pkgdisplay.cc:62
+#: dselect/pkgdisplay.cc
 msgid "Important"
 msgstr ""
 
-#: dselect/pkgdisplay.cc:63
+#: dselect/pkgdisplay.cc
 msgid "Standard"
 msgstr ""
 
-#: dselect/pkgdisplay.cc:64
+#: dselect/pkgdisplay.cc
 msgid "Optional"
 msgstr ""
 
-#: dselect/pkgdisplay.cc:65
+#: dselect/pkgdisplay.cc
 msgid "Extra"
 msgstr ""
 
-#: dselect/pkgdisplay.cc:66
-msgid "!Bug!"
-msgstr ""
-
-#: dselect/pkgdisplay.cc:67
+#: dselect/pkgdisplay.cc
 msgid "Unclassified"
 msgstr ""
 
-#: dselect/pkgdisplay.cc:70
+#: dselect/pkgdisplay.cc
 msgid "suggests"
 msgstr ""
 
-#: dselect/pkgdisplay.cc:71
+#: dselect/pkgdisplay.cc
 msgid "recommends"
 msgstr ""
 
-#: dselect/pkgdisplay.cc:72
+#: dselect/pkgdisplay.cc
 msgid "depends on"
 msgstr ""
 
-#: dselect/pkgdisplay.cc:73
+#: dselect/pkgdisplay.cc
 msgid "pre-depends on"
 msgstr ""
 
-#: dselect/pkgdisplay.cc:74
+#: dselect/pkgdisplay.cc
 msgid "breaks"
 msgstr ""
 
-#: dselect/pkgdisplay.cc:75
+#: dselect/pkgdisplay.cc
 msgid "conflicts with"
 msgstr ""
 
-#: dselect/pkgdisplay.cc:76
+#: dselect/pkgdisplay.cc
 msgid "provides"
 msgstr ""
 
-#: dselect/pkgdisplay.cc:77
+#: dselect/pkgdisplay.cc
 msgid "replaces"
 msgstr ""
 
-#: dselect/pkgdisplay.cc:78
+#: dselect/pkgdisplay.cc
 msgid "enhances"
 msgstr ""
 
-#: dselect/pkgdisplay.cc:81
+#: dselect/pkgdisplay.cc
 msgid "Req"
 msgstr ""
 
-#: dselect/pkgdisplay.cc:82
+#: dselect/pkgdisplay.cc
 msgid "Imp"
 msgstr ""
 
-#: dselect/pkgdisplay.cc:83
+#: dselect/pkgdisplay.cc
 msgid "Std"
 msgstr ""
 
-#: dselect/pkgdisplay.cc:84
+#: dselect/pkgdisplay.cc
 msgid "Opt"
 msgstr ""
 
-#: dselect/pkgdisplay.cc:85
+#: dselect/pkgdisplay.cc
 msgid "Xtr"
 msgstr ""
 
-#: dselect/pkgdisplay.cc:86
+#: dselect/pkgdisplay.cc
 msgid "bUG"
 msgstr ""
 
-#: dselect/pkgdisplay.cc:87
+#: dselect/pkgdisplay.cc
 msgid "?"
 msgstr ""
 
-#: dselect/pkgdisplay.cc:95 dselect/pkgdisplay.cc:115
+#: dselect/pkgdisplay.cc
 msgid "Broken"
 msgstr "Oštećeni"
 
-#: dselect/pkgdisplay.cc:96
+#: dselect/pkgdisplay.cc
 msgid "New"
 msgstr "Novi"
 
-#: dselect/pkgdisplay.cc:97
-msgid "Updated"
-msgstr "Ažurirani"
+#: dselect/pkgdisplay.cc
+msgid "Upgradable"
+msgstr ""
 
-#: dselect/pkgdisplay.cc:98
+#: dselect/pkgdisplay.cc
 msgid "Obsolete/local"
 msgstr "Zastarjeli/lokalni"
 
-#: dselect/pkgdisplay.cc:99
-msgid "Up-to-date"
-msgstr "Ažurirani"
+#: dselect/pkgdisplay.cc
+msgid "Installed"
+msgstr "Instalirano"
 
-#: dselect/pkgdisplay.cc:100
+#: dselect/pkgdisplay.cc
 msgid "Available"
 msgstr "Dostupni"
 
-#: dselect/pkgdisplay.cc:101 dselect/pkgdisplay.cc:117
+#: dselect/pkgdisplay.cc
 msgid "Removed"
 msgstr "Uklonjeni"
 
-#: dselect/pkgdisplay.cc:102 dselect/pkgdisplay.cc:111
+#: dselect/pkgdisplay.cc
 msgid "Brokenly installed packages"
 msgstr "Nepravilno instalirani paketi"
 
-#: dselect/pkgdisplay.cc:103
+#: dselect/pkgdisplay.cc
 msgid "Newly available packages"
 msgstr "Novi dostupni paketi"
 
-#: dselect/pkgdisplay.cc:104
-msgid "Updated packages (newer version is available)"
-msgstr "Ažurirani paketi (novija verzija je dostupna)"
+#: dselect/pkgdisplay.cc
+#, fuzzy
+#| msgid "Newly available packages"
+msgid "Upgradable packages"
+msgstr "Novi dostupni paketi"
 
-#: dselect/pkgdisplay.cc:105
-msgid "Obsolete and local packages present on system"
+#: dselect/pkgdisplay.cc
+#, fuzzy
+#| msgid "Obsolete and local packages present on system"
+msgid "Obsolete and locally created packages"
 msgstr "Zastarjeli i lokalni paketi prisutni na sistemu"
 
-#: dselect/pkgdisplay.cc:106
-msgid "Up to date installed packages"
-msgstr "Ažurirani instalirani paketi"
+#: dselect/pkgdisplay.cc
+msgid "Installed packages"
+msgstr "Instalirani paketi"
 
-#: dselect/pkgdisplay.cc:107
-msgid "Available packages (not currently installed)"
-msgstr "Dostupni paketi (trenutno nisu instalirani)"
+#: dselect/pkgdisplay.cc
+#, fuzzy
+#| msgid "Up to date installed packages"
+msgid "Available not installed packages"
+msgstr "Ažurirani instalirani paketi"
 
-#: dselect/pkgdisplay.cc:108
+#: dselect/pkgdisplay.cc
 msgid "Removed and no longer available packages"
 msgstr "Uklonjeni i više nedostupni paketi"
 
-#: dselect/pkgdisplay.cc:112
-msgid "Installed packages"
-msgstr "Instalirani paketi"
-
-#: dselect/pkgdisplay.cc:113
+#: dselect/pkgdisplay.cc
 msgid "Removed packages (configuration still present)"
 msgstr "Uklonjeni paketi (konfiguracijske datoteke još prisutne)"
 
-#: dselect/pkgdisplay.cc:114
+#: dselect/pkgdisplay.cc
 msgid "Purged packages and those never installed"
 msgstr "Očišćeni paketi i oni koji nisu prije bili instalirani"
 
-#: dselect/pkgdisplay.cc:116
-msgid "Installed"
-msgstr "Instalirano"
-
-#: dselect/pkgdisplay.cc:118
+#: dselect/pkgdisplay.cc
 msgid "Purged"
 msgstr "Očišćeno"
 
-#: dselect/pkgdisplay.cc:138
+#: dselect/pkgdisplay.cc
 msgid "Error"
 msgstr "Greška"
 
-#: dselect/pkgdisplay.cc:139
+#: dselect/pkgdisplay.cc
 msgid "Installed?"
 msgstr ""
 
-#: dselect/pkgdisplay.cc:140
+#: dselect/pkgdisplay.cc
 msgid "Old mark"
 msgstr ""
 
-#: dselect/pkgdisplay.cc:141
+#: dselect/pkgdisplay.cc
 msgid "Marked for"
 msgstr ""
 
-#: dselect/pkgdisplay.cc:143
+#: dselect/pkgdisplay.cc
 msgid "EIOM"
 msgstr ""
 
-#: dselect/pkgdisplay.cc:147 dselect/pkgdisplay.cc:150
+#: dselect/pkgdisplay.cc
 msgid "Section"
 msgstr "Sekcija"
 
-#: dselect/pkgdisplay.cc:148
+#: dselect/pkgdisplay.cc
 msgid "Priority"
 msgstr "Prioritet"
 
-#: dselect/pkgdisplay.cc:152
+#: dselect/pkgdisplay.cc
 msgid "Package"
 msgstr "Paket"
 
-#: dselect/pkgdisplay.cc:161 dselect/pkgdisplay.cc:165
+#: dselect/pkgdisplay.cc
 #, fuzzy
 #| msgid "Avail.ver"
 msgid "Avail.arch"
 msgstr "Dostup.ver"
 
-#: dselect/pkgdisplay.cc:164
+#: dselect/pkgdisplay.cc
 #, fuzzy
 #| msgid "Inst.ver"
 msgid "Inst.arch"
 msgstr "Inst.ver"
 
-#: dselect/pkgdisplay.cc:178 dselect/pkgdisplay.cc:182
+#: dselect/pkgdisplay.cc
 msgid "Avail.ver"
 msgstr "Dostup.ver"
 
-#: dselect/pkgdisplay.cc:181
+#: dselect/pkgdisplay.cc
 msgid "Inst.ver"
 msgstr "Inst.ver"
 
-#: dselect/pkgdisplay.cc:197
+#: dselect/pkgdisplay.cc
 msgid "dselect - recursive package listing"
 msgstr ""
 
-#: dselect/pkgdisplay.cc:199
+#: dselect/pkgdisplay.cc
 msgid "dselect - inspection of package states"
 msgstr ""
 
-#: dselect/pkgdisplay.cc:200
+#: dselect/pkgdisplay.cc
 msgid "dselect - main package listing"
 msgstr ""
 
-#: dselect/pkgdisplay.cc:208
+#: dselect/pkgdisplay.cc
 msgid " (by section)"
 msgstr ""
 
-#: dselect/pkgdisplay.cc:211
+#: dselect/pkgdisplay.cc
 msgid " (avail., section)"
 msgstr ""
 
-#: dselect/pkgdisplay.cc:214
+#: dselect/pkgdisplay.cc
 msgid " (status, section)"
 msgstr ""
 
-#: dselect/pkgdisplay.cc:223
+#: dselect/pkgdisplay.cc
 msgid " (by priority)"
 msgstr ""
 
-#: dselect/pkgdisplay.cc:226
+#: dselect/pkgdisplay.cc
 msgid " (avail., priority)"
 msgstr ""
 
-#: dselect/pkgdisplay.cc:229
+#: dselect/pkgdisplay.cc
 msgid " (status, priority)"
 msgstr ""
 
-#: dselect/pkgdisplay.cc:238
+#: dselect/pkgdisplay.cc
 msgid " (alphabetically)"
 msgstr ""
 
-#: dselect/pkgdisplay.cc:241
+#: dselect/pkgdisplay.cc
 msgid " (by availability)"
 msgstr ""
 
-#: dselect/pkgdisplay.cc:244
+#: dselect/pkgdisplay.cc
 msgid " (by status)"
 msgstr ""
 
-#: dselect/pkgdisplay.cc:259
+#: dselect/pkgdisplay.cc
 msgid " mark:+/=/- terse:v help:?"
 msgstr ""
 
-#: dselect/pkgdisplay.cc:260
+#: dselect/pkgdisplay.cc
 msgid " mark:+/=/- verbose:v help:?"
 msgstr ""
 
-#: dselect/pkgdisplay.cc:262
+#: dselect/pkgdisplay.cc
 msgid " terse:v help:?"
 msgstr ""
 
-#: dselect/pkgdisplay.cc:263
+#: dselect/pkgdisplay.cc
 msgid " verbose:v help:?"
 msgstr ""
 
-#: dselect/pkginfo.cc:85
+#: dselect/pkginfo.cc
 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 "
@@ -1348,78 +1348,98 @@ msgid ""
 "opportunity to mark packages in different kinds of groups."
 msgstr ""
 
-#: dselect/pkginfo.cc:98
+#: dselect/pkginfo.cc
 msgid "Interrelationships"
 msgstr ""
 
-#: dselect/pkginfo.cc:117
+#: dselect/pkginfo.cc
 msgid "No description available."
 msgstr ""
 
-#: dselect/pkginfo.cc:135
+#: dselect/pkginfo.cc
 msgid "Installed control file information"
 msgstr ""
 
-#: dselect/pkginfo.cc:151
+#: dselect/pkginfo.cc
 msgid "Available control file information"
 msgstr ""
 
-#: dselect/pkglist.cc:425
+#: dselect/pkglist.cc
 #, fuzzy
 #| msgid "Installed packages"
 msgid "there are no packages"
 msgstr "Instalirani paketi"
 
-#: dselect/pkglist.cc:521
+#: dselect/pkglist.cc
 msgid "invalid search option given"
 msgstr ""
 
-#: dselect/pkglist.cc:536
+#: dselect/pkglist.cc
 msgid "error in regular expression"
 msgstr ""
 
-#: dselect/pkgsublist.cc:111
+#: dselect/pkgsublist.cc
 msgid " does not appear to be available\n"
 msgstr ""
 
-#: dselect/pkgsublist.cc:131
+#: dselect/pkgsublist.cc
 msgid " or "
 msgstr ""
 
-#: dselect/pkgtop.cc:58
+#: dselect/pkgtop.cc
 msgid "All"
 msgstr ""
 
-#: dselect/pkgtop.cc:80
+#: dselect/pkgtop.cc
 msgid "All packages"
 msgstr ""
 
-#: dselect/pkgtop.cc:84
+#: dselect/pkgtop.cc
 #, c-format
 msgid "%s packages without a section"
 msgstr ""
 
-#: dselect/pkgtop.cc:86
+#: dselect/pkgtop.cc
 #, c-format
 msgid "%s packages in section %s"
 msgstr ""
 
-#: dselect/pkgtop.cc:92
+#: dselect/pkgtop.cc
 #, c-format
 msgid "%s %s packages"
 msgstr ""
 
-#: dselect/pkgtop.cc:96
+#: dselect/pkgtop.cc
 #, c-format
 msgid "%s %s packages without a section"
 msgstr ""
 
-#: dselect/pkgtop.cc:98
+#: dselect/pkgtop.cc
 #, c-format
 msgid "%s %s packages in section %s"
 msgstr ""
 
-#: dselect/pkgtop.cc:119
+#: dselect/pkgtop.cc
 #, c-format
 msgid "%-*s %s%s%s;  %s (was: %s).  %s"
 msgstr ""
+
+#, fuzzy
+#~| msgid "Section"
+#~ msgid "Actions:\n"
+#~ msgstr "Sekcija"
+
+#~ msgid "Colours:\n"
+#~ msgstr "Boje:\n"
+
+#~ msgid "Updated"
+#~ msgstr "Ažurirani"
+
+#~ msgid "Up-to-date"
+#~ msgstr "Ažurirani"
+
+#~ msgid "Updated packages (newer version is available)"
+#~ msgstr "Ažurirani paketi (novija verzija je dostupna)"
+
+#~ msgid "Available packages (not currently installed)"
+#~ msgstr "Dostupni paketi (trenutno nisu instalirani)"
diff --git a/dselect/po/ca.po b/dselect/po/ca.po
index 9dee93336..1ba9da017 100644
--- a/dselect/po/ca.po
+++ b/dselect/po/ca.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dselect 1.17.23\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2014-12-23 18:12+0100\n"
+"POT-Creation-Date: 2015-04-06 09:37+0200\n"
 "PO-Revision-Date: 2014-12-07 21:43+0100\n"
 "Last-Translator: Guillem Jover <guillem@debian.org>\n"
 "Language-Team: Catalan <debian-l10n-catalan@lists.debian.org>\n"
@@ -17,28 +17,28 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: dselect/basecmds.cc:125
+#: dselect/basecmds.cc
 msgid "Search for ? "
 msgstr "Cerca: "
 
-#: dselect/basecmds.cc:149
+#: dselect/basecmds.cc
 msgid "Error: "
 msgstr "Error: "
 
-#: dselect/basecmds.cc:180
+#: dselect/basecmds.cc
 msgid "Help: "
 msgstr "Ajuda: "
 
-#: dselect/basecmds.cc:186
+#: dselect/basecmds.cc
 msgid "Press ? for help menu, . for next topic, <space> to exit help."
 msgstr ""
 "Premeu ? per al menú d'ajuda, . per al següent tema, <espai> per a sortir."
 
-#: dselect/basecmds.cc:193
+#: dselect/basecmds.cc
 msgid "Help information is available under the following topics:"
 msgstr "La info. d'ajuda està disponible sota els següents temes:"
 
-#: dselect/basecmds.cc:201
+#: dselect/basecmds.cc
 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. "
@@ -46,239 +46,239 @@ msgstr ""
 "Premeu una tecla de de la llista superior, <espai> o «q» per a sortir de\n"
 "l'ajuda, o «.» (punt) per a llegir cada pàgina d'ajuda al seu torn. "
 
-#: dselect/basecmds.cc:207
+#: dselect/basecmds.cc
 msgid "error reading keyboard in help"
 msgstr "s'ha produït un error en llegir del teclat en l'ajuda"
 
-#: dselect/baselist.cc:60
+#: dselect/baselist.cc
 msgid "ioctl(TIOCGWINSZ) failed"
 msgstr "ha fallat ioctl(TIOCGWINSZ)"
 
-#: dselect/baselist.cc:63
+#: dselect/baselist.cc
 msgid "doupdate in SIGWINCH handler failed"
 msgstr "ha fallat el «doupdate» en el gestor de SIGWINCH"
 
-#: dselect/baselist.cc:72
+#: dselect/baselist.cc
 msgid "failed to restore old SIGWINCH sigact"
 msgstr "no s'ha pogut restablir l'antic senyal SIGWINCH"
 
-#: dselect/baselist.cc:75
+#: dselect/baselist.cc
 msgid "failed to restore old signal mask"
 msgstr "no s'ha pogut restablir la màscara de senyal antiga"
 
-#: dselect/baselist.cc:86
+#: dselect/baselist.cc
 msgid "failed to get old signal mask"
 msgstr "no s'ha pogut obtindre la màscara de senyal antiga"
 
-#: dselect/baselist.cc:88
+#: dselect/baselist.cc
 msgid "failed to get old SIGWINCH sigact"
 msgstr "no s'ha pogut obtindre l'antic senyal SIGWINCH"
 
-#: dselect/baselist.cc:93
+#: dselect/baselist.cc
 msgid "failed to block SIGWINCH"
 msgstr "no s'ha pogut blocar SIGWINCH"
 
-#: dselect/baselist.cc:99
+#: dselect/baselist.cc
 msgid "failed to set new SIGWINCH sigact"
 msgstr "no s'ha pogut establir el senyal nou SIGWINCH"
 
-#: dselect/baselist.cc:174
+#: dselect/baselist.cc
 msgid "failed to allocate colour pair"
 msgstr "no s'ha pogut assignar una parella de colors"
 
-#: dselect/baselist.cc:203
+#: dselect/baselist.cc
 msgid "failed to create title window"
 msgstr "no s'ha pogut crear la finestra de títol"
 
-#: dselect/baselist.cc:207
+#: dselect/baselist.cc
 msgid "failed to create whatinfo window"
 msgstr "no s'ha pogut crear la finestra de «whatinfo»"
 
-#: dselect/baselist.cc:211
+#: dselect/baselist.cc
 msgid "failed to create baselist pad"
 msgstr "no s'ha pogut crear el «baselist pad»"
 
-#: dselect/baselist.cc:214
+#: dselect/baselist.cc
 msgid "failed to create heading pad"
 msgstr "no s'ha pogut crear el «heading pad»"
 
-#: dselect/baselist.cc:218
+#: dselect/baselist.cc
 msgid "failed to create thisstate pad"
 msgstr "no s'ha pogut crear el «thisstate pad»"
 
-#: dselect/baselist.cc:222
+#: dselect/baselist.cc
 msgid "failed to create info pad"
 msgstr "no s'ha pogut crear el «info pad»"
 
-#: dselect/baselist.cc:227
+#: dselect/baselist.cc
 msgid "failed to create query window"
 msgstr "no s'ha pogut crear la finestra de pregunta"
 
-#: dselect/baselist.cc:298
+#: dselect/baselist.cc
 msgid "Keybindings"
 msgstr "Assignacions de tecles"
 
-#: dselect/baselist.cc:347
+#: dselect/baselist.cc
 #, c-format
 msgid "  -- %d%%, press "
 msgstr "  -- %d%%, premeu "
 
-#: dselect/baselist.cc:350
+#: dselect/baselist.cc
 #, c-format
 msgid "%s for more"
 msgstr "%s per a continuar"
 
-#: dselect/baselist.cc:354
+#: dselect/baselist.cc
 #, c-format
 msgid "%s to go back"
 msgstr "%s per a tornar"
 
-#: dselect/bindings.cc:78
+#: dselect/bindings.cc
 msgid "[not bound]"
 msgstr "[no associada]"
 
-#: dselect/bindings.cc:82
+#: dselect/bindings.cc
 #, c-format
 msgid "[unk: %d]"
 msgstr "[desc: %d]"
 
-#: dselect/bindings.cc:141
+#: dselect/bindings.cc
 msgid "Scroll onwards through help/information"
 msgstr "Avança a través de l'ajuda/info."
 
-#: dselect/bindings.cc:142
+#: dselect/bindings.cc
 msgid "Scroll backwards through help/information"
 msgstr "Retrocedeix a través de l'ajuda/info."
 
-#: dselect/bindings.cc:143
+#: dselect/bindings.cc
 msgid "Move up"
 msgstr "Amunt"
 
-#: dselect/bindings.cc:144
+#: dselect/bindings.cc
 msgid "Move down"
 msgstr "Avall"
 
-#: dselect/bindings.cc:145
+#: dselect/bindings.cc
 msgid "Go to top of list"
 msgstr "Vés al principi de la llista"
 
-#: dselect/bindings.cc:146
+#: dselect/bindings.cc
 msgid "Go to end of list"
 msgstr "Vés al final de la llista"
 
-#: dselect/bindings.cc:147
+#: dselect/bindings.cc
 msgid "Request help (cycle through help screens)"
 msgstr "Demana ajuda (avança per les pàgines d'ajuda)"
 
-#: dselect/bindings.cc:148
+#: dselect/bindings.cc
 msgid "Cycle through information displays"
 msgstr "Avança a través de les pantalles d'info."
 
-#: dselect/bindings.cc:149
+#: dselect/bindings.cc
 msgid "Redraw display"
 msgstr "Redibuixa la pantalla"
 
-#: dselect/bindings.cc:150
+#: dselect/bindings.cc
 msgid "Scroll onwards through list by 1 line"
 msgstr "Desplaça endavant a través de la llista en 1 línia"
 
-#: dselect/bindings.cc:151
+#: dselect/bindings.cc
 msgid "Scroll backwards through list by 1 line"
 msgstr "Desplaça enrere a través de la llista en 1 línia"
 
-#: dselect/bindings.cc:152
+#: dselect/bindings.cc
 msgid "Scroll onwards through help/information by 1 line"
 msgstr "Desplaça endavant a través de l'ajuda/info. en 1 línia"
 
-#: dselect/bindings.cc:153
+#: dselect/bindings.cc
 msgid "Scroll backwards through help/information by 1 line"
 msgstr "Desplaça enrere a través de l'ajuda/info. en 1 línia"
 
-#: dselect/bindings.cc:154
+#: dselect/bindings.cc
 msgid "Scroll onwards through list"
 msgstr "Desplaça endavant a través de la llista"
 
-#: dselect/bindings.cc:155
+#: dselect/bindings.cc
 msgid "Scroll backwards through list"
 msgstr "Desplaça enrere a través de la llista"
 
-#: dselect/bindings.cc:158
+#: dselect/bindings.cc
 msgid "Mark package(s) for installation"
 msgstr "Marca els paquets per a instal·lar"
 
-#: dselect/bindings.cc:159
+#: dselect/bindings.cc
 msgid "Mark package(s) for deinstallation"
 msgstr "Marca el/els paquet(s) per a desinstal·lar"
 
-#: dselect/bindings.cc:160
+#: dselect/bindings.cc
 msgid "Mark package(s) for deinstall and purge"
 msgstr "Marca el/els paquet(s) per a desinstal·lar i purgar"
 
-#: dselect/bindings.cc:161
+#: dselect/bindings.cc
 msgid "Make highlight more specific"
 msgstr "Fes un ressaltat més específic"
 
-#: dselect/bindings.cc:162
+#: dselect/bindings.cc
 msgid "Make highlight less specific"
 msgstr "Fes un ressaltat menys específic"
 
-#: dselect/bindings.cc:163
+#: dselect/bindings.cc
 msgid "Search for a package whose name contains a string"
 msgstr "Cerca un paquet per al qual el nom contingui una cadena"
 
-#: dselect/bindings.cc:164
+#: dselect/bindings.cc
 msgid "Repeat last search"
 msgstr "Repeteix la darrera recerca"
 
-#: dselect/bindings.cc:165
+#: dselect/bindings.cc
 msgid "Swap sort order priority/section"
 msgstr "Intercanvia el mecanisme d'ordre prioritat/secció"
 
-#: dselect/bindings.cc:166
+#: dselect/bindings.cc
 msgid "Quit, confirming, and checking dependencies"
 msgstr "Surt, confirmant i comprovant dependències"
 
-#: dselect/bindings.cc:167
+#: dselect/bindings.cc
 msgid "Quit, confirming without check"
 msgstr "Surt, confirmant i sense comprovar dependències"
 
-#: dselect/bindings.cc:168
+#: dselect/bindings.cc
 msgid "Quit, rejecting conflict/dependency suggestions"
 msgstr "Surt, rebutjant els suggeriments de conflictes/dependències"
 
-#: dselect/bindings.cc:169
+#: dselect/bindings.cc
 msgid "Abort - quit without making changes"
 msgstr "Interromp - surt sense fer cap canvi"
 
-#: dselect/bindings.cc:170
+#: dselect/bindings.cc
 msgid "Revert to old state for all packages"
 msgstr "Reverteix a l'antic estat per a tots els paquets"
 
-#: dselect/bindings.cc:171
+#: dselect/bindings.cc
 msgid "Revert to suggested state for all packages"
 msgstr "Reverteix a l'estat suggerit per a tots els paquets"
 
-#: dselect/bindings.cc:172
+#: dselect/bindings.cc
 msgid "Revert to directly requested state for all packages"
 msgstr "Reverteix a l'estat requerit directament per a tots els paquets"
 
-#: dselect/bindings.cc:173
+#: dselect/bindings.cc
 msgid "Revert to currently installed state for all packages"
 msgstr "Reverteix a l'estat actual d'instal·lació per a tots els paquets"
 
-#: dselect/bindings.cc:176
+#: dselect/bindings.cc
 msgid "Select currently-highlighted access method"
 msgstr "Selecciona el mètode d'accés actualment ressaltat"
 
-#: dselect/bindings.cc:177
+#: dselect/bindings.cc
 msgid "Quit without changing selected access method"
 msgstr "Surt sense canviar el mètode d'accés seleccionat"
 
-#: dselect/helpmsgs.cc:29
+#: dselect/helpmsgs.cc
 msgid "Keystrokes"
 msgstr "Assignacions de tecles"
 
-#: dselect/helpmsgs.cc:29
+#: dselect/helpmsgs.cc
 msgid ""
 "Motion keys: Next/Previous, Top/End, Up/Down, Backwards/Forwards:\n"
 "  j, Down-arrow         k, Up-arrow             move highlight\n"
@@ -343,11 +343,11 @@ msgstr ""
 "   D    deixa-ho tot en l'estat requerit        n, \\  repeteix la darrera "
 "cerca\n"
 
-#: dselect/helpmsgs.cc:55
+#: dselect/helpmsgs.cc
 msgid "Introduction to package selections"
 msgstr "Introducció a les seleccions de paquets"
 
-#: dselect/helpmsgs.cc:55
+#: dselect/helpmsgs.cc
 msgid ""
 "Welcome to dselect's main package listing.\n"
 "\n"
@@ -403,11 +403,11 @@ msgstr ""
 "\n"
 "Premeu <espai> per a abandonar l'ajuda i entrar ara al llistat.\n"
 
-#: dselect/helpmsgs.cc:80
+#: dselect/helpmsgs.cc
 msgid "Introduction to read-only package list browser"
 msgstr "Introducció al navegador només lectura del llistat de paquets"
 
-#: dselect/helpmsgs.cc:80
+#: dselect/helpmsgs.cc
 msgid ""
 "Welcome to dselect's main package listing.\n"
 "\n"
@@ -444,11 +444,11 @@ msgstr ""
 "\n"
 "Premeu <espai> per a abandonar l'ajuda i entrar ara al llistat.\n"
 
-#: dselect/helpmsgs.cc:99
+#: dselect/helpmsgs.cc
 msgid "Introduction to conflict/dependency resolution sub-list"
 msgstr "Introducció a la subllista de resolució de conflictes/dependències"
 
-#: dselect/helpmsgs.cc:99
+#: dselect/helpmsgs.cc
 msgid ""
 "Dependency/conflict resolution - introduction.\n"
 "\n"
@@ -511,11 +511,11 @@ msgstr ""
 "Premeu <espai> per a abandonar l'ajuda i entrar en la subllista; recordeu:\n"
 "premeu «?» per a obtindre ajuda.\n"
 
-#: dselect/helpmsgs.cc:125
+#: dselect/helpmsgs.cc
 msgid "Display, part 1: package listing and status chars"
 msgstr "Mostra, primera part: llistat de paquets i caràcters d'estat"
 
-#: dselect/helpmsgs.cc:125
+#: dselect/helpmsgs.cc
 msgid ""
 "The top half of the screen shows a list of packages.  For each package you "
 "see\n"
@@ -578,11 +578,11 @@ msgstr ""
 "instal·lada de cada paquet (majús-V per a mostrar/amagar) i descripció\n"
 "resumida.\n"
 
-#: dselect/helpmsgs.cc:152
+#: dselect/helpmsgs.cc
 msgid "Display, part 2: list highlight; information display"
 msgstr "Mostra, segona part: llista ressaltada; mostra la info."
 
-#: dselect/helpmsgs.cc:152
+#: dselect/helpmsgs.cc
 msgid ""
 "* Highlight: One line in the package list will be highlighted.  It "
 "indicates\n"
@@ -634,11 +634,11 @@ msgstr ""
 "tota\n"
 "  la pantalla.\n"
 
-#: dselect/helpmsgs.cc:176
+#: dselect/helpmsgs.cc
 msgid "Introduction to method selection display"
 msgstr "Introducció al mètode de selecció mostrat"
 
-#: dselect/helpmsgs.cc:176
+#: dselect/helpmsgs.cc
 msgid ""
 "dselect and dpkg can do automatic installation, loading the package files to "
 "be\n"
@@ -682,11 +682,11 @@ msgstr ""
 "La llista completa amb les combinacions de tecles es troba disponible al\n"
 "prémer «k», o des del menú d'ajuda al que s'accedeix prement «?».\n"
 
-#: dselect/helpmsgs.cc:196
+#: dselect/helpmsgs.cc
 msgid "Keystrokes for method selection"
 msgstr "Assignacions de tecles per a la selecció del mètode"
 
-#: dselect/helpmsgs.cc:196
+#: dselect/helpmsgs.cc
 msgid ""
 "Motion keys: Next/Previous, Top/End, Up/Down, Backwards/Forwards:\n"
 "  j, Down-arrow         k, Up-arrow             move highlight\n"
@@ -736,104 +736,104 @@ msgstr ""
 "   /                  cerca (Retorn cancel·la)\n"
 "   \\                  repeteix la darrera cerca\n"
 
-#: dselect/main.cc:63
+#: dselect/main.cc
 msgid "Type dselect --help for help."
 msgstr "Teclegeu dselect --help per a obtindre ajuda."
 
-#: dselect/main.cc:145
+#: dselect/main.cc
 msgid "a"
 msgstr "m"
 
-#: dselect/main.cc:145
+#: dselect/main.cc
 msgid "[A]ccess"
 msgstr "[M]ètode"
 
-#: dselect/main.cc:145
+#: dselect/main.cc
 msgid "Choose the access method to use."
 msgstr "Escull el mètode d'accés que emprareu."
 
-#: dselect/main.cc:146
+#: dselect/main.cc
 msgid "u"
 msgstr "a"
 
-#: dselect/main.cc:146
+#: dselect/main.cc
 msgid "[U]pdate"
 msgstr "[A]ctualitza"
 
-#: dselect/main.cc:146
+#: dselect/main.cc
 msgid "Update list of available packages, if possible."
 msgstr "Actualitza la llista de paquets disponibles, si és possible."
 
-#: dselect/main.cc:147
+#: dselect/main.cc
 msgid "s"
 msgstr "s"
 
-#: dselect/main.cc:147
+#: dselect/main.cc
 msgid "[S]elect"
 msgstr "[S]elecciona"
 
-#: dselect/main.cc:147
+#: dselect/main.cc
 msgid "Request which packages you want on your system."
 msgstr "Selecciona els paquets que voleu en el sistema."
 
-#: dselect/main.cc:148
+#: dselect/main.cc
 msgid "i"
 msgstr "i"
 
-#: dselect/main.cc:148
+#: dselect/main.cc
 msgid "[I]nstall"
 msgstr "[I]nstal·la"
 
-#: dselect/main.cc:148
+#: dselect/main.cc
 msgid "Install and upgrade wanted packages."
 msgstr "Instal·la i actualitza els paquets desitjats."
 
-#: dselect/main.cc:149
+#: dselect/main.cc
 msgid "c"
 msgstr "c"
 
-#: dselect/main.cc:149
+#: dselect/main.cc
 msgid "[C]onfig"
 msgstr "[C]onfigura"
 
-#: dselect/main.cc:149
+#: dselect/main.cc
 msgid "Configure any packages that are unconfigured."
 msgstr "Configura els paquets que no estiguin configurats."
 
-#: dselect/main.cc:150
+#: dselect/main.cc
 msgid "r"
 msgstr "d"
 
-#: dselect/main.cc:150
+#: dselect/main.cc
 msgid "[R]emove"
 msgstr "[D]esinstal·la"
 
-#: dselect/main.cc:150
+#: dselect/main.cc
 msgid "Remove unwanted software."
 msgstr "Desinstal·la els paquets no desitjats."
 
-#: dselect/main.cc:151
+#: dselect/main.cc
 msgid "q"
 msgstr "t"
 
-#: dselect/main.cc:151
+#: dselect/main.cc
 msgid "[Q]uit"
 msgstr "Sur[T]"
 
-#: dselect/main.cc:151
+#: dselect/main.cc
 msgid "Quit dselect."
 msgstr "Surt de dselect."
 
-#: dselect/main.cc:152
+#: dselect/main.cc
 msgid "menu"
 msgstr "menú"
 
-#: dselect/main.cc:157
+#: dselect/main.cc
 #, c-format
 msgid "Debian `%s' package handling frontend version %s.\n"
 msgstr "Interfície de gestió de paquets «%s» de Debian versió %s.\n"
 
-#: dselect/main.cc:160
+#: dselect/main.cc
 msgid ""
 "This is free software; see the GNU General Public License version 2 or\n"
 "later for copying conditions. There is NO warranty.\n"
@@ -841,29 +841,47 @@ msgstr ""
 "Això és programari lliure, vegeu la Llicència Publica General GNU versió 2\n"
 "o posterior per a les condicions de còpia. No hi ha CAP garantia.\n"
 
-#: dselect/main.cc:169 dselect/main.cc:217
+#: dselect/main.cc
 msgid "<standard output>"
 msgstr "<eixida estàndard>"
 
-#: dselect/main.cc:180
-#, c-format
+#: dselect/main.cc
+#, fuzzy, c-format
+#| msgid ""
+#| "Usage: %s [<option> ...] [<action> ...]\n"
+#| "\n"
 msgid ""
-"Usage: %s [<option> ...] [<action> ...]\n"
+"Usage: %s [<option>...] [<command>...]\n"
 "\n"
 msgstr ""
 "Forma d'ús: %s [<opció> …] [<acció> …]\n"
 "\n"
 
-#: dselect/main.cc:184
+#: dselect/main.cc
 #, c-format
+msgid "Commands:\n"
+msgstr ""
+
+#: dselect/main.cc
+#, fuzzy, c-format
+#| msgid ""
+#| "Options:\n"
+#| "  --admindir <directory>     Use <directory> instead of %s.\n"
+#| "  --expert                   Turn on expert mode.\n"
+#| "  --debug <file> | -D<file>  Turn on debugging, sending output to "
+#| "<file>.\n"
+#| "  --colour | --color screenpart:[foreground],[background][:attr[+attr"
+#| "+...]]\n"
+#| "                             Configure screen colours.\n"
+#| "\n"
 msgid ""
 "Options:\n"
-"  --admindir <directory>     Use <directory> instead of %s.\n"
-"  --expert                   Turn on expert mode.\n"
-"  --debug <file> | -D<file>  Turn on debugging, sending output to <file>.\n"
-"  --colour | --color screenpart:[foreground],[background][:attr[+attr+...]]\n"
-"                             Configure screen colours.\n"
-"\n"
+"      --admindir <directory>       Use <directory> instead of %s.\n"
+"      --expert                     Turn on expert mode.\n"
+"  -D, --debug <file>               Turn on debugging, send output to "
+"<file>.\n"
+"      --color <color-spec>         Configure screen colors.\n"
+"      --colour <color-spec>        Ditto.\n"
 msgstr ""
 "Opcions:\n"
 "  --admindir <directori>        Utilitza <directori> en comptes de %s.\n"
@@ -874,72 +892,79 @@ msgstr ""
 "                                Configura els colors de la pantalla.\n"
 "\n"
 
-#: dselect/main.cc:193
-#, c-format
+#: dselect/main.cc
+#, fuzzy, c-format
+#| msgid ""
+#| "  --help                     Show this help message.\n"
+#| "  --version                  Show the version.\n"
+#| "\n"
 msgid ""
-"  --help                     Show this help message.\n"
-"  --version                  Show the version.\n"
+"  -?, --help                       Show this help message.\n"
+"      --version                    Show the version.\n"
 "\n"
 msgstr ""
 "  --help                        Mostra aquest missatge d'ajuda.\n"
 "  --version                     Mostra la versió.\n"
 "\n"
 
-#: dselect/main.cc:197
+#: dselect/main.cc
 #, c-format
-msgid "Actions:\n"
-msgstr "Accions:\n"
+msgid ""
+"<color-spec> is <screen-part>:[<foreground>],[<background>][:"
+"<attr>[+<attr>]...]\n"
+msgstr ""
 
-#: dselect/main.cc:202
-#, c-format
-msgid "Screenparts:\n"
+#: dselect/main.cc
+#, fuzzy, c-format
+#| msgid "Screenparts:\n"
+msgid "<screen-part> is:"
 msgstr "Parts de la pantalla:\n"
 
-#: dselect/main.cc:207
+#: dselect/main.cc
 #, c-format
-msgid "Colours:\n"
-msgstr "Colors:\n"
+msgid "<color> is:"
+msgstr ""
 
-#: dselect/main.cc:212
+#: dselect/main.cc
 #, c-format
-msgid "Attributes:\n"
-msgstr "Atributs:\n"
+msgid "<attr> is:"
+msgstr ""
 
-#: dselect/main.cc:232
+#: dselect/main.cc
 #, c-format
 msgid "couldn't open debug file `%.255s'\n"
 msgstr "no es pot obrir el fitxer de depuració «%.255s»\n"
 
-#: dselect/main.cc:253
+#: dselect/main.cc
 #, c-format
 msgid "invalid %s '%s'"
 msgstr "%s no és vàlid: «%s»"
 
-#: dselect/main.cc:272
+#: dselect/main.cc
 msgid "screen part"
 msgstr "part de la pantalla"
 
-#: dselect/main.cc:278
+#: dselect/main.cc
 msgid "null colour specification"
 msgstr "especificació de color nul·la"
 
-#: dselect/main.cc:286 dselect/main.cc:291
+#: dselect/main.cc
 msgid "colour"
 msgstr "color"
 
-#: dselect/main.cc:299
+#: dselect/main.cc
 msgid "colour attribute"
 msgstr "atribut del color"
 
-#: dselect/main.cc:333
+#: dselect/main.cc
 msgid "Terminal does not appear to support cursor addressing.\n"
 msgstr "El terminal no permet l'ús de direccionament de cursor.\n"
 
-#: dselect/main.cc:335
+#: dselect/main.cc
 msgid "Terminal does not appear to support highlighting.\n"
 msgstr "El terminal no permet l'ús de ressaltats.\n"
 
-#: dselect/main.cc:337
+#: dselect/main.cc
 #, c-format
 msgid ""
 "Set your TERM variable correctly, use a better terminal,\n"
@@ -948,11 +973,11 @@ msgstr ""
 "Establiu la variable TERM correctament, utilitzeu un terminal millor\n"
 "o feu la construcció amb l'eina de gestió per paquets %s.\n"
 
-#: dselect/main.cc:340
+#: dselect/main.cc
 msgid "terminal lacks necessary features, giving up"
 msgstr "el terminal no té les característiques necessàries, s'està avortant"
 
-#: dselect/main.cc:425
+#: dselect/main.cc
 msgid ""
 "\n"
 "\n"
@@ -966,7 +991,7 @@ msgstr ""
 "Premeu <enter> per a confirmar la selecció.   ^L redibuixa la pantalla.\n"
 "\n"
 
-#: dselect/main.cc:430
+#: dselect/main.cc
 msgid ""
 "Copyright (C) 1994-1996 Ian Jackson.\n"
 "Copyright (C) 2000,2001 Wichert Akkerman.\n"
@@ -974,7 +999,7 @@ msgstr ""
 "Copyright © 1994-1996 Ian Jackson.\n"
 "Copyright © 2000, 2001 Wichert akkerman.\n"
 
-#: dselect/main.cc:436
+#: dselect/main.cc
 msgid ""
 "\n"
 "\n"
@@ -984,57 +1009,57 @@ msgstr ""
 "\n"
 "Accés de només lectura: només és poden veure les selecciones disponibles!"
 
-#: dselect/main.cc:455
+#: dselect/main.cc
 msgid "failed to getch in main menu"
 msgstr "no s'ha pogut fer «getch» en el menú principal"
 
-#: dselect/main.cc:538
+#: dselect/main.cc
 #, c-format
 msgid "unknown action string `%.50s'"
 msgstr "la cadena d'acció «%.50s» és desconeguda"
 
-#: dselect/methlist.cc:66
+#: dselect/methlist.cc
 msgid "Abbrev."
 msgstr "Abreujament"
 
-#: dselect/methlist.cc:67 dselect/pkgdisplay.cc:188 dselect/pkginfo.cc:110
+#: dselect/methlist.cc dselect/pkgdisplay.cc dselect/pkginfo.cc
 msgid "Description"
 msgstr "Descripció"
 
-#: dselect/methlist.cc:73
+#: dselect/methlist.cc
 msgid "dselect - list of access methods"
 msgstr "dselect - llista dels mètodes d'accés"
 
-#: dselect/methlist.cc:82
+#: dselect/methlist.cc
 #, c-format
 msgid "Access method `%s'."
 msgstr "Mètode d'accés «%s»."
 
-#: dselect/methlist.cc:161 dselect/pkglist.cc:587
+#: dselect/methlist.cc dselect/pkglist.cc
 msgid "doupdate failed"
 msgstr "«doupdate» ha fallat"
 
-#: dselect/methlist.cc:164 dselect/pkglist.cc:590
+#: dselect/methlist.cc dselect/pkglist.cc
 msgid "failed to unblock SIGWINCH"
 msgstr "no s'ha pogut desblocar SIGWINCH"
 
-#: dselect/methlist.cc:169 dselect/pkglist.cc:595
+#: dselect/methlist.cc dselect/pkglist.cc
 msgid "failed to re-block SIGWINCH"
 msgstr "no s'ha pogut tornar a blocar SIGWINCH"
 
-#: dselect/methlist.cc:170 dselect/pkglist.cc:597
+#: dselect/methlist.cc dselect/pkglist.cc
 msgid "getch failed"
 msgstr "getch ha fallat"
 
-#: dselect/methlist.cc:187
+#: dselect/methlist.cc
 msgid "Explanation"
 msgstr "Explicació"
 
-#: dselect/methlist.cc:197
+#: dselect/methlist.cc
 msgid "No explanation available."
 msgstr "No hi ha explicació disponible."
 
-#: dselect/method.cc:67
+#: dselect/method.cc
 #, c-format
 msgid ""
 "\n"
@@ -1045,7 +1070,7 @@ msgstr ""
 "\n"
 "%s: %s\n"
 
-#: dselect/method.cc:70
+#: dselect/method.cc
 msgid ""
 "\n"
 "Press <enter> to continue."
@@ -1053,189 +1078,199 @@ msgstr ""
 "\n"
 "Premeu <enter> per a continuar."
 
-#: dselect/method.cc:82
+#: dselect/method.cc
 msgid "cannot unlock access method area"
 msgstr "no es pot desblocar l'àrea del mètode d'accés"
 
-#: dselect/method.cc:96
+#: dselect/method.cc
 msgid "no access methods are available"
 msgstr "no hi ha cap mètode d'accés disponible"
 
-#: dselect/method.cc:115
+#: dselect/method.cc
 msgid "requested operation requires superuser privilege"
 msgstr "la operació sol·licitada requereix privilegis de superusuari"
 
-#: dselect/method.cc:118
+#: dselect/method.cc
 msgid "cannot open or create access method lockfile"
 msgstr "no es pot obrir o crear el fitxer de blocatge del mètode d'accés"
 
-#: dselect/method.cc:125
+#: dselect/method.cc
 msgid "the access method area is already locked"
 msgstr "l'àrea del mètode d'accés ja esta blocada"
 
-#: dselect/method.cc:128
+#: dselect/method.cc
 msgid "cannot lock access method area"
 msgstr "no es pot blocar l'àrea del mètode d'accés"
 
-#: dselect/method.cc:161
+#: dselect/method.cc
 #, c-format
 msgid "Press <enter> to continue.\n"
 msgstr "Premeu <enter> per a continuar.\n"
 
-#: dselect/method.cc:162
+#: dselect/method.cc
 msgid "<standard error>"
 msgstr "<eixida d'error estàndard>"
 
-#: dselect/method.cc:165
+#: dselect/method.cc
 msgid "error reading acknowledgement of program failure message"
 msgstr ""
 "s'ha produït un error en llegir el reconeixement del missatge de la falla "
 "del programa"
 
-#: dselect/method.cc:187
+#: dselect/method.cc
 msgid "no access method is selected or configured"
 msgstr "no hi ha cap mètode d'accés seleccionat o configurat"
 
-#: dselect/method.cc:196
+#: dselect/method.cc
 msgid "update available list script"
 msgstr "seqüència d'actualització de la llista «available»"
 
-#: dselect/method.cc:200
+#: dselect/method.cc
 msgid "installation script"
 msgstr "seqüència d'instal·lació"
 
-#: dselect/method.cc:246
+#: dselect/method.cc
 msgid "query/setup script"
 msgstr "seqüència de petició/configuració"
 
-#: dselect/methparse.cc:53
+#: dselect/methparse.cc
 #, c-format
 msgid "syntax error in method options file `%.250s' -- %s"
 msgstr "error de sintaxi al fitxer d'opcions del mètode «%.250s» -- %s"
 
-#: dselect/methparse.cc:59
+#: dselect/methparse.cc
 #, c-format
 msgid "error reading options file `%.250s'"
 msgstr "s'ha produït un error en llegir el fitxer d'opcions «%.250s»"
 
-#: dselect/methparse.cc:93
+#: dselect/methparse.cc
 #, c-format
 msgid "unable to read `%.250s' directory for reading methods"
 msgstr "no es pot llegir el directori «%.250s» per a llegir els mètodes"
 
-#: dselect/methparse.cc:109
+#: dselect/methparse.cc
 #, c-format
 msgid "method `%.250s' has name that is too long (%d > %d characters)"
 msgstr "el mètode «%.250s» té un nom massa llarg (%d > %d caràcters)"
 
-#: dselect/methparse.cc:120
+#: dselect/methparse.cc
 #, c-format
 msgid "unable to access method script `%.250s'"
 msgstr "no es pot accedir a la seqüència del mètode «%.250s»"
 
-#: dselect/methparse.cc:126
+#: dselect/methparse.cc
 #, c-format
 msgid "unable to read method options file `%.250s'"
 msgstr "no es pot llegir el fitxer d'opcions del mètode «%.250s»"
 
-#: dselect/methparse.cc:150
+#: dselect/methparse.cc
 msgid "non-digit where digit wanted"
 msgstr "s'ha trobat un no dígit quan s'esperava un dígit"
 
-#: dselect/methparse.cc:153
-msgid "EOF in index string"
+#: dselect/methparse.cc
+#, fuzzy
+#| msgid "EOF in index string"
+msgid "end of file in index string"
 msgstr "EOF en la cadena d'índex"
 
-#: dselect/methparse.cc:156
+#: dselect/methparse.cc
 msgid "index string too long"
 msgstr "cadena d'índex massa llarga"
 
-#: dselect/methparse.cc:159
+#: dselect/methparse.cc
 msgid "newline before option name start"
 msgstr "línia nova abans de que comenci el nom de l'opció"
 
-#: dselect/methparse.cc:161
-msgid "EOF before option name start"
-msgstr "EOF abans de que comenci el nom de l'opció"
+#: dselect/methparse.cc
+#, fuzzy
+#| msgid "newline before option name start"
+msgid "end of file before option name start"
+msgstr "línia nova abans de que comenci el nom de l'opció"
 
-#: dselect/methparse.cc:165
+#: dselect/methparse.cc
 msgid "nonalpha where option name start wanted"
 msgstr "caràcter no alfanumèric on s'esperava el principi del nom d'una opció"
 
-#: dselect/methparse.cc:167
+#: dselect/methparse.cc
 msgid "non-alphanum in option name"
 msgstr "caràcter no alfanumèric en el nom d'opció"
 
-#: dselect/methparse.cc:170
-msgid "EOF in option name"
+#: dselect/methparse.cc
+#, fuzzy
+#| msgid "EOF in option name"
+msgid "end of file in option name"
 msgstr "EOF dins del nom de l'opció"
 
-#: dselect/methparse.cc:175
+#: dselect/methparse.cc
 msgid "newline before summary"
 msgstr "línia nova abans del resum"
 
-#: dselect/methparse.cc:177
-msgid "EOF before summary"
-msgstr "EOF abans del resum"
+#: dselect/methparse.cc
+#, fuzzy
+#| msgid "newline before summary"
+msgid "end of file before summary"
+msgstr "línia nova abans del resum"
 
-#: dselect/methparse.cc:183
-msgid "EOF in summary - missing newline"
+#: dselect/methparse.cc
+#, fuzzy
+#| msgid "EOF in summary - missing newline"
+msgid "end of file in summary - missing newline"
 msgstr "EOF en el resum - falta una línia nova"
 
-#: dselect/methparse.cc:193
+#: dselect/methparse.cc
 #, c-format
 msgid "unable to open option description file `%.250s'"
 msgstr "no es pot obrir el fitxer de descripció d'opcions «%.250s»"
 
-#: dselect/methparse.cc:197
+#: dselect/methparse.cc
 #, c-format
 msgid "unable to stat option description file `%.250s'"
 msgstr "no es pot fer «stat» sobre el fitxer de descripció d'opcions «%.250s»"
 
-#: dselect/methparse.cc:201
+#: dselect/methparse.cc
 #, c-format
 msgid "failed to read option description file `%.250s'"
 msgstr "no s'ha pogut llegir el fitxer de descripció d'opcions «%.250s»"
 
-#: dselect/methparse.cc:204
+#: dselect/methparse.cc
 #, c-format
 msgid "error during read of option description file `%.250s'"
 msgstr ""
 "s'ha produït un error en llegir el fitxer de descripció d'opcions «%.250s»"
 
-#: dselect/methparse.cc:227
+#: dselect/methparse.cc
 #, c-format
 msgid "error during read of method options file `%.250s'"
 msgstr ""
 "s'ha produït un error en llegir el fitxer d'opcions del mètode «%.250s»"
 
-#: dselect/methparse.cc:250
+#: dselect/methparse.cc
 #, c-format
 msgid "unable to open current option file `%.250s'"
 msgstr "no es pot obrir l'actual fitxer d'opcions «%.250s»"
 
-#: dselect/methparse.cc:286
+#: dselect/methparse.cc
 #, c-format
 msgid "unable to write new option to `%.250s'"
 msgstr "no es pot escriure una opció nova en «%.250s»"
 
-#: dselect/pkgdisplay.cc:36
+#: dselect/pkgdisplay.cc
 msgid "new package"
 msgstr "paquet nou"
 
-#: dselect/pkgdisplay.cc:37
+#: dselect/pkgdisplay.cc
 msgid "install"
 msgstr "instal·la"
 
-#: dselect/pkgdisplay.cc:38
+#: dselect/pkgdisplay.cc
 msgid "hold"
 msgstr "manté"
 
-#: dselect/pkgdisplay.cc:39
+#: dselect/pkgdisplay.cc
 msgid "remove"
 msgstr "desinstal·la"
 
-#: dselect/pkgdisplay.cc:40
+#: dselect/pkgdisplay.cc
 msgid "purge"
 msgstr "purgar"
 
@@ -1243,327 +1278,321 @@ msgstr "purgar"
 #. * the empty string to store information about the translation. DO NOT
 #. * CHANGE THAT IN A TRANSLATION! The code really relies on that being
 #. * a single space.
-#: dselect/pkgdisplay.cc:47
+#: dselect/pkgdisplay.cc
 msgid " "
 msgstr " "
 
-#: dselect/pkgdisplay.cc:48
+#: dselect/pkgdisplay.cc
 msgid "REINSTALL"
 msgstr "REINSTAL·LA"
 
-#: dselect/pkgdisplay.cc:51
+#: dselect/pkgdisplay.cc
 msgid "not installed"
 msgstr "no instal·lat"
 
-#: dselect/pkgdisplay.cc:52
+#: dselect/pkgdisplay.cc
 msgid "removed (configs remain)"
 msgstr "desinstal·lat (queden els config)"
 
-#: dselect/pkgdisplay.cc:53
+#: dselect/pkgdisplay.cc
 msgid "half installed"
 msgstr "instal·lat a mitges"
 
-#: dselect/pkgdisplay.cc:54
+#: dselect/pkgdisplay.cc
 msgid "unpacked (not set up)"
 msgstr "desempaquetat (no configurat)"
 
-#: dselect/pkgdisplay.cc:55
+#: dselect/pkgdisplay.cc
 msgid "half configured (config failed)"
 msgstr "a mig configurar (configuració fallida)"
 
-#: dselect/pkgdisplay.cc:56
+#: dselect/pkgdisplay.cc
 msgid "awaiting trigger processing"
 msgstr "esperant el processament dels activadors"
 
-#: dselect/pkgdisplay.cc:57
+#: dselect/pkgdisplay.cc
 msgid "triggered"
 msgstr "activat"
 
-#: dselect/pkgdisplay.cc:58
+#: dselect/pkgdisplay.cc
 msgid "installed"
 msgstr "instal·lat"
 
-#: dselect/pkgdisplay.cc:61
+#: dselect/pkgdisplay.cc
 msgid "Required"
 msgstr "Requerit"
 
-#: dselect/pkgdisplay.cc:62
+#: dselect/pkgdisplay.cc
 msgid "Important"
 msgstr "Important"
 
-#: dselect/pkgdisplay.cc:63
+#: dselect/pkgdisplay.cc
 msgid "Standard"
 msgstr "Estàndard"
 
-#: dselect/pkgdisplay.cc:64
+#: dselect/pkgdisplay.cc
 msgid "Optional"
 msgstr "Opcional"
 
-#: dselect/pkgdisplay.cc:65
+#: dselect/pkgdisplay.cc
 msgid "Extra"
 msgstr "Extra"
 
-#: dselect/pkgdisplay.cc:66
-msgid "!Bug!"
-msgstr "!Error!"
-
-#: dselect/pkgdisplay.cc:67
+#: dselect/pkgdisplay.cc
 msgid "Unclassified"
 msgstr "Sense classificar"
 
-#: dselect/pkgdisplay.cc:70
+#: dselect/pkgdisplay.cc
 msgid "suggests"
 msgstr "suggereix"
 
-#: dselect/pkgdisplay.cc:71
+#: dselect/pkgdisplay.cc
 msgid "recommends"
 msgstr "recomana"
 
-#: dselect/pkgdisplay.cc:72
+#: dselect/pkgdisplay.cc
 msgid "depends on"
 msgstr "depèn de"
 
-#: dselect/pkgdisplay.cc:73
+#: dselect/pkgdisplay.cc
 msgid "pre-depends on"
 msgstr "predepèn de"
 
-#: dselect/pkgdisplay.cc:74
+#: dselect/pkgdisplay.cc
 msgid "breaks"
 msgstr "trenca"
 
-#: dselect/pkgdisplay.cc:75
+#: dselect/pkgdisplay.cc
 msgid "conflicts with"
 msgstr "entra en conflicte amb"
 
-#: dselect/pkgdisplay.cc:76
+#: dselect/pkgdisplay.cc
 msgid "provides"
 msgstr "proveeix"
 
-#: dselect/pkgdisplay.cc:77
+#: dselect/pkgdisplay.cc
 msgid "replaces"
 msgstr "reemplaça"
 
-#: dselect/pkgdisplay.cc:78
+#: dselect/pkgdisplay.cc
 msgid "enhances"
 msgstr "amplia"
 
-#: dselect/pkgdisplay.cc:81
+#: dselect/pkgdisplay.cc
 msgid "Req"
 msgstr "Req"
 
-#: dselect/pkgdisplay.cc:82
+#: dselect/pkgdisplay.cc
 msgid "Imp"
 msgstr "Imp"
 
-#: dselect/pkgdisplay.cc:83
+#: dselect/pkgdisplay.cc
 msgid "Std"
 msgstr "Est"
 
-#: dselect/pkgdisplay.cc:84
+#: dselect/pkgdisplay.cc
 msgid "Opt"
 msgstr "Opc"
 
-#: dselect/pkgdisplay.cc:85
+#: dselect/pkgdisplay.cc
 msgid "Xtr"
 msgstr "Ext"
 
-#: dselect/pkgdisplay.cc:86
+#: dselect/pkgdisplay.cc
 msgid "bUG"
 msgstr "bUG"
 
-#: dselect/pkgdisplay.cc:87
+#: dselect/pkgdisplay.cc
 msgid "?"
 msgstr "?"
 
-#: dselect/pkgdisplay.cc:95 dselect/pkgdisplay.cc:115
+#: dselect/pkgdisplay.cc
 msgid "Broken"
 msgstr "Trencat"
 
-#: dselect/pkgdisplay.cc:96
+#: dselect/pkgdisplay.cc
 msgid "New"
 msgstr "Nou"
 
-#: dselect/pkgdisplay.cc:97
-msgid "Updated"
-msgstr "Amb actualització disponible"
+#: dselect/pkgdisplay.cc
+msgid "Upgradable"
+msgstr ""
 
-#: dselect/pkgdisplay.cc:98
+#: dselect/pkgdisplay.cc
 msgid "Obsolete/local"
 msgstr "Obsolet/local"
 
-#: dselect/pkgdisplay.cc:99
-msgid "Up-to-date"
-msgstr "Actualitzat"
+#: dselect/pkgdisplay.cc
+msgid "Installed"
+msgstr "Instal·lat"
 
-#: dselect/pkgdisplay.cc:100
+#: dselect/pkgdisplay.cc
 msgid "Available"
 msgstr "Disponible"
 
-#: dselect/pkgdisplay.cc:101 dselect/pkgdisplay.cc:117
+#: dselect/pkgdisplay.cc
 msgid "Removed"
 msgstr "Desinstal·lats"
 
-#: dselect/pkgdisplay.cc:102 dselect/pkgdisplay.cc:111
+#: dselect/pkgdisplay.cc
 msgid "Brokenly installed packages"
 msgstr "Paquets mal instal·lats"
 
-#: dselect/pkgdisplay.cc:103
+#: dselect/pkgdisplay.cc
 msgid "Newly available packages"
 msgstr "Nous paquets disponibles"
 
-#: dselect/pkgdisplay.cc:104
-msgid "Updated packages (newer version is available)"
-msgstr "Actualització disponible"
+#: dselect/pkgdisplay.cc
+#, fuzzy
+#| msgid "Newly available packages"
+msgid "Upgradable packages"
+msgstr "Nous paquets disponibles"
 
-#: dselect/pkgdisplay.cc:105
-msgid "Obsolete and local packages present on system"
+#: dselect/pkgdisplay.cc
+#, fuzzy
+#| msgid "Obsolete and local packages present on system"
+msgid "Obsolete and locally created packages"
 msgstr "Paquets obsolets i presents en el sistema"
 
-#: dselect/pkgdisplay.cc:106
-msgid "Up to date installed packages"
-msgstr "Paquets actualitzats, no hi ha versió més nova"
+#: dselect/pkgdisplay.cc
+msgid "Installed packages"
+msgstr "Paquets instal·lats"
 
-#: dselect/pkgdisplay.cc:107
-msgid "Available packages (not currently installed)"
-msgstr "Paquets disponibles (no instal·lats actualment)"
+#: dselect/pkgdisplay.cc
+#, fuzzy
+#| msgid "Up to date installed packages"
+msgid "Available not installed packages"
+msgstr "Paquets actualitzats, no hi ha versió més nova"
 
-#: dselect/pkgdisplay.cc:108
+#: dselect/pkgdisplay.cc
 msgid "Removed and no longer available packages"
 msgstr "Paquets desinstal·lats que ja no estan disponibles"
 
-#: dselect/pkgdisplay.cc:112
-msgid "Installed packages"
-msgstr "Paquets instal·lats"
-
-#: dselect/pkgdisplay.cc:113
+#: dselect/pkgdisplay.cc
 msgid "Removed packages (configuration still present)"
 msgstr "Paquets desinstal·lats (falta la configuració)"
 
-#: dselect/pkgdisplay.cc:114
+#: dselect/pkgdisplay.cc
 msgid "Purged packages and those never installed"
 msgstr "Paquets purgats o que no mai foren instal·lats"
 
-#: dselect/pkgdisplay.cc:116
-msgid "Installed"
-msgstr "Instal·lat"
-
-#: dselect/pkgdisplay.cc:118
+#: dselect/pkgdisplay.cc
 msgid "Purged"
 msgstr "Purgats"
 
-#: dselect/pkgdisplay.cc:138
+#: dselect/pkgdisplay.cc
 msgid "Error"
 msgstr "Error"
 
-#: dselect/pkgdisplay.cc:139
+#: dselect/pkgdisplay.cc
 msgid "Installed?"
 msgstr "Instal·lat?"
 
-#: dselect/pkgdisplay.cc:140
+#: dselect/pkgdisplay.cc
 msgid "Old mark"
 msgstr "Marca antiga"
 
-#: dselect/pkgdisplay.cc:141
+#: dselect/pkgdisplay.cc
 msgid "Marked for"
 msgstr "Marcat per a"
 
-#: dselect/pkgdisplay.cc:143
+#: dselect/pkgdisplay.cc
 msgid "EIOM"
 msgstr "EIOM"
 
-#: dselect/pkgdisplay.cc:147 dselect/pkgdisplay.cc:150
+#: dselect/pkgdisplay.cc
 msgid "Section"
 msgstr "Secció"
 
-#: dselect/pkgdisplay.cc:148
+#: dselect/pkgdisplay.cc
 msgid "Priority"
 msgstr "Prioritat"
 
-#: dselect/pkgdisplay.cc:152
+#: dselect/pkgdisplay.cc
 msgid "Package"
 msgstr "Paquet"
 
-#: dselect/pkgdisplay.cc:161 dselect/pkgdisplay.cc:165
+#: dselect/pkgdisplay.cc
 msgid "Avail.arch"
 msgstr "Arq.disp."
 
-#: dselect/pkgdisplay.cc:164
+#: dselect/pkgdisplay.cc
 msgid "Inst.arch"
 msgstr "Arq.inst."
 
-#: dselect/pkgdisplay.cc:178 dselect/pkgdisplay.cc:182
+#: dselect/pkgdisplay.cc
 msgid "Avail.ver"
 msgstr "Ver.disp."
 
-#: dselect/pkgdisplay.cc:181
+#: dselect/pkgdisplay.cc
 msgid "Inst.ver"
 msgstr "Ver.inst."
 
-#: dselect/pkgdisplay.cc:197
+#: dselect/pkgdisplay.cc
 msgid "dselect - recursive package listing"
 msgstr "dselect - llista recursiva de paquets"
 
-#: dselect/pkgdisplay.cc:199
+#: dselect/pkgdisplay.cc
 msgid "dselect - inspection of package states"
 msgstr "dselect - inspecció de l'estat dels paquets"
 
-#: dselect/pkgdisplay.cc:200
+#: dselect/pkgdisplay.cc
 msgid "dselect - main package listing"
 msgstr "dselect - llistat de paquets"
 
-#: dselect/pkgdisplay.cc:208
+#: dselect/pkgdisplay.cc
 msgid " (by section)"
 msgstr " (per secció)"
 
-#: dselect/pkgdisplay.cc:211
+#: dselect/pkgdisplay.cc
 msgid " (avail., section)"
 msgstr " (disp., secció)"
 
-#: dselect/pkgdisplay.cc:214
+#: dselect/pkgdisplay.cc
 msgid " (status, section)"
 msgstr " (estat, secció)"
 
-#: dselect/pkgdisplay.cc:223
+#: dselect/pkgdisplay.cc
 msgid " (by priority)"
 msgstr " (per prioritat)"
 
-#: dselect/pkgdisplay.cc:226
+#: dselect/pkgdisplay.cc
 msgid " (avail., priority)"
 msgstr " (disp., prioritat)"
 
-#: dselect/pkgdisplay.cc:229
+#: dselect/pkgdisplay.cc
 msgid " (status, priority)"
 msgstr " (estat, prioritat)"
 
-#: dselect/pkgdisplay.cc:238
+#: dselect/pkgdisplay.cc
 msgid " (alphabetically)"
 msgstr " (alfabèticament)"
 
-#: dselect/pkgdisplay.cc:241
+#: dselect/pkgdisplay.cc
 msgid " (by availability)"
 msgstr " (per disponibilitat)"
 
-#: dselect/pkgdisplay.cc:244
+#: dselect/pkgdisplay.cc
 msgid " (by status)"
 msgstr " (per estat)"
 
-#: dselect/pkgdisplay.cc:259
+#: dselect/pkgdisplay.cc
 msgid " mark:+/=/- terse:v help:?"
 msgstr " marca:+/=/- concís:v ajuda:?"
 
-#: dselect/pkgdisplay.cc:260
+#: dselect/pkgdisplay.cc
 msgid " mark:+/=/- verbose:v help:?"
 msgstr " marca:+/=/- depuració:v ajuda:?"
 
-#: dselect/pkgdisplay.cc:262
+#: dselect/pkgdisplay.cc
 msgid " terse:v help:?"
 msgstr " concís:v ajuda:?"
 
-#: dselect/pkgdisplay.cc:263
+#: dselect/pkgdisplay.cc
 msgid " verbose:v help:?"
 msgstr " depuració:v ajuda:?"
 
-#: dselect/pkginfo.cc:85
+#: dselect/pkginfo.cc
 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 "
@@ -1583,80 +1612,110 @@ msgstr ""
 "Podeu emprar «o» i «O» per a canviar l'ordre dels paquets llistats permetent-"
 "vos marcar els paquets per diferents classes o grups."
 
-#: dselect/pkginfo.cc:98
+#: dselect/pkginfo.cc
 msgid "Interrelationships"
 msgstr "Interrelacions"
 
-#: dselect/pkginfo.cc:117
+#: dselect/pkginfo.cc
 msgid "No description available."
 msgstr "No hi ha cap descripció disponible."
 
-#: dselect/pkginfo.cc:135
+#: dselect/pkginfo.cc
 msgid "Installed control file information"
 msgstr "Informació del fitxer de control instal·lada"
 
-#: dselect/pkginfo.cc:151
+#: dselect/pkginfo.cc
 msgid "Available control file information"
 msgstr "Informació del fitxer de control disponible"
 
-#: dselect/pkglist.cc:425
+#: dselect/pkglist.cc
 msgid "there are no packages"
 msgstr "no hi ha paquets"
 
-#: dselect/pkglist.cc:521
+#: dselect/pkglist.cc
 msgid "invalid search option given"
 msgstr "s'ha donat una opció de recerca no vàlida"
 
-#: dselect/pkglist.cc:536
+#: dselect/pkglist.cc
 msgid "error in regular expression"
 msgstr "error en l'expressió regular"
 
-#: dselect/pkgsublist.cc:111
+#: dselect/pkgsublist.cc
 msgid " does not appear to be available\n"
 msgstr " no sembla estar disponible\n"
 
-#: dselect/pkgsublist.cc:131
+#: dselect/pkgsublist.cc
 msgid " or "
 msgstr " o "
 
-#: dselect/pkgtop.cc:58
+#: dselect/pkgtop.cc
 msgid "All"
 msgstr "Tots"
 
-#: dselect/pkgtop.cc:80
+#: dselect/pkgtop.cc
 msgid "All packages"
 msgstr "Tots els paquets"
 
-#: dselect/pkgtop.cc:84
+#: dselect/pkgtop.cc
 #, c-format
 msgid "%s packages without a section"
 msgstr "%s paquets sense secció"
 
-#: dselect/pkgtop.cc:86
+#: dselect/pkgtop.cc
 #, c-format
 msgid "%s packages in section %s"
 msgstr "%s paquets en la secció %s"
 
-#: dselect/pkgtop.cc:92
+#: dselect/pkgtop.cc
 #, c-format
 msgid "%s %s packages"
 msgstr "Paquets %s %s"
 
-#: dselect/pkgtop.cc:96
+#: dselect/pkgtop.cc
 #, c-format
 msgid "%s %s packages without a section"
 msgstr "Paquets %s %s sense secció"
 
-#: dselect/pkgtop.cc:98
+#: dselect/pkgtop.cc
 #, c-format
 msgid "%s %s packages in section %s"
 msgstr "Paquets %s %s en la secció %s"
 
-#: dselect/pkgtop.cc:119
+#: dselect/pkgtop.cc
 #, c-format
 msgid "%-*s %s%s%s;  %s (was: %s).  %s"
 msgstr "%-*s %s%s%s;  %s (era: %s).  %s"
 
+#~ msgid "Actions:\n"
+#~ msgstr "Accions:\n"
+
+#~ msgid "Colours:\n"
+#~ msgstr "Colors:\n"
+
+#~ msgid "Attributes:\n"
+#~ msgstr "Atributs:\n"
+
+#~ msgid "EOF before option name start"
+#~ msgstr "EOF abans de que comenci el nom de l'opció"
+
+#~ msgid "EOF before summary"
+#~ msgstr "EOF abans del resum"
+
+#~ msgid "!Bug!"
+#~ msgstr "!Error!"
+
+#~ msgid "Updated"
+#~ msgstr "Amb actualització disponible"
+
+#~ msgid "Up-to-date"
+#~ msgstr "Actualitzat"
+
+#~ msgid "Updated packages (newer version is available)"
+#~ msgstr "Actualització disponible"
+
+#~ msgid "Available packages (not currently installed)"
+#~ msgstr "Paquets disponibles (no instal·lats actualment)"
+
 #~ msgid "unable to open new option file `%.250s'"
 #~ msgstr "no es pot obrir el fitxer d'opcions nou «%.250s»"
 
diff --git a/dselect/po/cs.po b/dselect/po/cs.po
index 399f43321..f3ba240d5 100644
--- a/dselect/po/cs.po
+++ b/dselect/po/cs.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dselect 1.17.0\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2014-12-23 18:12+0100\n"
+"POT-Creation-Date: 2015-04-06 09:37+0200\n"
 "PO-Revision-Date: 2014-11-29 11:26+0100\n"
 "Last-Translator: Miroslav Kure <kurem@debian.cz>\n"
 "Language-Team: Czech <debian-l10n-czech@lists.debian.org>\n"
@@ -19,27 +19,27 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: dselect/basecmds.cc:125
+#: dselect/basecmds.cc
 msgid "Search for ? "
 msgstr "Hledej řetězec: "
 
-#: dselect/basecmds.cc:149
+#: dselect/basecmds.cc
 msgid "Error: "
 msgstr "Chyba: "
 
-#: dselect/basecmds.cc:180
+#: dselect/basecmds.cc
 msgid "Help: "
 msgstr "Nápověda: "
 
-#: dselect/basecmds.cc:186
+#: dselect/basecmds.cc
 msgid "Press ? for help menu, . for next topic, <space> to exit help."
 msgstr "Pro nápovědu stiskněte ?, pro další téma . a pro konec <mezeru>."
 
-#: dselect/basecmds.cc:193
+#: dselect/basecmds.cc
 msgid "Help information is available under the following topics:"
 msgstr "Nápověda je dostupná pro následující témata:"
 
-#: dselect/basecmds.cc:201
+#: dselect/basecmds.cc
 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. "
@@ -47,239 +47,239 @@ msgstr ""
 "Stiskněte klávesu ze seznamu výše, <mezeru> nebo `q' pro opuštění\n"
 "  nápovědy nebo tečku pro postupné čtení všech stránek nápovědy. "
 
-#: dselect/basecmds.cc:207
+#: dselect/basecmds.cc
 msgid "error reading keyboard in help"
 msgstr "chyba při čtení klávesnice v nápovědě"
 
-#: dselect/baselist.cc:60
+#: dselect/baselist.cc
 msgid "ioctl(TIOCGWINSZ) failed"
 msgstr "ioctl(TIOCGWINSZ) selhalo"
 
-#: dselect/baselist.cc:63
+#: dselect/baselist.cc
 msgid "doupdate in SIGWINCH handler failed"
 msgstr "selhání doupdate v ovladači SIGWINCH"
 
-#: dselect/baselist.cc:72
+#: dselect/baselist.cc
 msgid "failed to restore old SIGWINCH sigact"
 msgstr "nepovedlo se obnovit původní zpracování signálu v SIGWINCH"
 
-#: dselect/baselist.cc:75
+#: dselect/baselist.cc
 msgid "failed to restore old signal mask"
 msgstr "nepovedlo se obnovit původní masku signálů"
 
-#: dselect/baselist.cc:86
+#: dselect/baselist.cc
 msgid "failed to get old signal mask"
 msgstr "nepovedlo se získat původní masku signálů"
 
-#: dselect/baselist.cc:88
+#: dselect/baselist.cc
 msgid "failed to get old SIGWINCH sigact"
 msgstr "nepovedlo se získat původní nastavení zpracování signálu v SIGWINCH"
 
-#: dselect/baselist.cc:93
+#: dselect/baselist.cc
 msgid "failed to block SIGWINCH"
 msgstr "nepovedlo se zablokovat SIGWINCH"
 
-#: dselect/baselist.cc:99
+#: dselect/baselist.cc
 msgid "failed to set new SIGWINCH sigact"
 msgstr "nepovedlo se nastavit nové zpracování signálu v SIGWINCH"
 
-#: dselect/baselist.cc:174
+#: dselect/baselist.cc
 msgid "failed to allocate colour pair"
 msgstr "nepovedlo se alokovat pár barev"
 
-#: dselect/baselist.cc:203
+#: dselect/baselist.cc
 msgid "failed to create title window"
 msgstr "nepovedlo se vytvořit titulní okno"
 
-#: dselect/baselist.cc:207
+#: dselect/baselist.cc
 msgid "failed to create whatinfo window"
 msgstr "nepovedlo se vytvořit informační okno"
 
-#: dselect/baselist.cc:211
+#: dselect/baselist.cc
 msgid "failed to create baselist pad"
 msgstr "nepovedlo se vytvořit okno základního seznamu"
 
-#: dselect/baselist.cc:214
+#: dselect/baselist.cc
 msgid "failed to create heading pad"
 msgstr "nepovedlo se vytvořit hlavičkové okno"
 
-#: dselect/baselist.cc:218
+#: dselect/baselist.cc
 msgid "failed to create thisstate pad"
 msgstr "nepodařilo se vytvořit stavové okno"
 
-#: dselect/baselist.cc:222
+#: dselect/baselist.cc
 msgid "failed to create info pad"
 msgstr "nepodařilo se vytvořit informační okno"
 
-#: dselect/baselist.cc:227
+#: dselect/baselist.cc
 msgid "failed to create query window"
 msgstr "nepodařilo se vytvořit dotazovací okno"
 
-#: dselect/baselist.cc:298
+#: dselect/baselist.cc
 msgid "Keybindings"
 msgstr "Funkce kláves"
 
-#: dselect/baselist.cc:347
+#: dselect/baselist.cc
 #, c-format
 msgid "  -- %d%%, press "
 msgstr "  -- %d%%, stiskněte "
 
-#: dselect/baselist.cc:350
+#: dselect/baselist.cc
 #, c-format
 msgid "%s for more"
 msgstr "%s pro zobrazení další informace"
 
-#: dselect/baselist.cc:354
+#: dselect/baselist.cc
 #, c-format
 msgid "%s to go back"
 msgstr "%s pro návrat zpět"
 
-#: dselect/bindings.cc:78
+#: dselect/bindings.cc
 msgid "[not bound]"
 msgstr "[nepřiřazeno]"
 
-#: dselect/bindings.cc:82
+#: dselect/bindings.cc
 #, c-format
 msgid "[unk: %d]"
 msgstr "[unk: %d]"
 
-#: dselect/bindings.cc:141
+#: dselect/bindings.cc
 msgid "Scroll onwards through help/information"
 msgstr "Rolování nápovědou/informacemi vpřed"
 
-#: dselect/bindings.cc:142
+#: dselect/bindings.cc
 msgid "Scroll backwards through help/information"
 msgstr "Rolování nápovědou/informacemi zpět"
 
-#: dselect/bindings.cc:143
+#: dselect/bindings.cc
 msgid "Move up"
 msgstr "Posun nahoru"
 
-#: dselect/bindings.cc:144
+#: dselect/bindings.cc
 msgid "Move down"
 msgstr "Posun dolů"
 
-#: dselect/bindings.cc:145
+#: dselect/bindings.cc
 msgid "Go to top of list"
 msgstr "Na začátek seznamu"
 
-#: dselect/bindings.cc:146
+#: dselect/bindings.cc
 msgid "Go to end of list"
 msgstr "Na konec seznamu"
 
-#: dselect/bindings.cc:147
+#: dselect/bindings.cc
 msgid "Request help (cycle through help screens)"
 msgstr "Vyžádání si nápovědy (cyklí po obrazovkách nápovědy)"
 
-#: dselect/bindings.cc:148
+#: dselect/bindings.cc
 msgid "Cycle through information displays"
 msgstr "Cyklí po obrazovkách s informacemi"
 
-#: dselect/bindings.cc:149
+#: dselect/bindings.cc
 msgid "Redraw display"
 msgstr "Překreslení obrazovky"
 
-#: dselect/bindings.cc:150
+#: dselect/bindings.cc
 msgid "Scroll onwards through list by 1 line"
 msgstr "Posun v seznamu o 1 řádek vpřed"
 
-#: dselect/bindings.cc:151
+#: dselect/bindings.cc
 msgid "Scroll backwards through list by 1 line"
 msgstr "Posun v seznamu o 1 řádek zpět"
 
-#: dselect/bindings.cc:152
+#: dselect/bindings.cc
 msgid "Scroll onwards through help/information by 1 line"
 msgstr "Posun v nápovědě/informacích o 1 řádek vpřed"
 
-#: dselect/bindings.cc:153
+#: dselect/bindings.cc
 msgid "Scroll backwards through help/information by 1 line"
 msgstr "Posun v nápovědě/informacích o 1 zpět"
 
-#: dselect/bindings.cc:154
+#: dselect/bindings.cc
 msgid "Scroll onwards through list"
 msgstr "Posun v seznamu vpřed"
 
-#: dselect/bindings.cc:155
+#: dselect/bindings.cc
 msgid "Scroll backwards through list"
 msgstr "Posun v seznamu zpět"
 
-#: dselect/bindings.cc:158
+#: dselect/bindings.cc
 msgid "Mark package(s) for installation"
 msgstr "Označení balíku(ů) pro instalaci"
 
-#: dselect/bindings.cc:159
+#: dselect/bindings.cc
 msgid "Mark package(s) for deinstallation"
 msgstr "Označení balíku(ů) pro odinstalaci"
 
-#: dselect/bindings.cc:160
+#: dselect/bindings.cc
 msgid "Mark package(s) for deinstall and purge"
 msgstr "Označení balíku(ů) pro odinstalaci a vyčištění"
 
-#: dselect/bindings.cc:161
+#: dselect/bindings.cc
 msgid "Make highlight more specific"
 msgstr "Učiní zvýraznění více specifickým"
 
-#: dselect/bindings.cc:162
+#: dselect/bindings.cc
 msgid "Make highlight less specific"
 msgstr "Učiní zvýraznění méně specifickým"
 
-#: dselect/bindings.cc:163
+#: dselect/bindings.cc
 msgid "Search for a package whose name contains a string"
 msgstr "Hledání balíku, jehož jméno obsahuje daný řetězec"
 
-#: dselect/bindings.cc:164
+#: dselect/bindings.cc
 msgid "Repeat last search"
 msgstr "Zopakování posledního hledání"
 
-#: dselect/bindings.cc:165
+#: dselect/bindings.cc
 msgid "Swap sort order priority/section"
 msgstr "Změna třídění podle priority/sekce"
 
-#: dselect/bindings.cc:166
+#: dselect/bindings.cc
 msgid "Quit, confirming, and checking dependencies"
 msgstr "Ukončení, potvrzení a kontrola závislostí"
 
-#: dselect/bindings.cc:167
+#: dselect/bindings.cc
 msgid "Quit, confirming without check"
 msgstr "Ukončení a potvrzení bez kontroly"
 
-#: dselect/bindings.cc:168
+#: dselect/bindings.cc
 msgid "Quit, rejecting conflict/dependency suggestions"
 msgstr "Ukončení, zamítnutí návrhů řešení konfliktů/závislostí"
 
-#: dselect/bindings.cc:169
+#: dselect/bindings.cc
 msgid "Abort - quit without making changes"
 msgstr "Vyskočení - ukončení bez provedení změn"
 
-#: dselect/bindings.cc:170
+#: dselect/bindings.cc
 msgid "Revert to old state for all packages"
 msgstr "Návrat původního stavu pro všechny balíky"
 
-#: dselect/bindings.cc:171
+#: dselect/bindings.cc
 msgid "Revert to suggested state for all packages"
 msgstr "Návrat navrhovaného stavu pro všechny balíky"
 
-#: dselect/bindings.cc:172
+#: dselect/bindings.cc
 msgid "Revert to directly requested state for all packages"
 msgstr "Návrat do požadovaných stavů pro všechny balíky"
 
-#: dselect/bindings.cc:173
+#: dselect/bindings.cc
 msgid "Revert to currently installed state for all packages"
 msgstr "Návrat do aktuálního instalovaného stavu pro všechny balíky"
 
-#: dselect/bindings.cc:176
+#: dselect/bindings.cc
 msgid "Select currently-highlighted access method"
 msgstr "Volba aktuálně vysvícené přístupové metody"
 
-#: dselect/bindings.cc:177
+#: dselect/bindings.cc
 msgid "Quit without changing selected access method"
 msgstr "Ukončení beze změny zvolené přístupové metody"
 
-#: dselect/helpmsgs.cc:29
+#: dselect/helpmsgs.cc
 msgid "Keystrokes"
 msgstr "Funkce kláves"
 
-#: dselect/helpmsgs.cc:29
+#: dselect/helpmsgs.cc
 msgid ""
 "Motion keys: Next/Previous, Top/End, Up/Down, Backwards/Forwards:\n"
 "  j, Down-arrow         k, Up-arrow             move highlight\n"
@@ -337,11 +337,11 @@ msgstr ""
 "   D     nastavení všeho žádaného stavu       n, \\  opakuje poslední "
 "hledání\n"
 
-#: dselect/helpmsgs.cc:55
+#: dselect/helpmsgs.cc
 msgid "Introduction to package selections"
 msgstr "Úvod do práce se seznamem balíků"
 
-#: dselect/helpmsgs.cc:55
+#: dselect/helpmsgs.cc
 msgid ""
 "Welcome to dselect's main package listing.\n"
 "\n"
@@ -395,11 +395,11 @@ msgstr ""
 "\n"
 "Pro opuštění nápovědy nyní stiskněte <mezeru>.\n"
 
-#: dselect/helpmsgs.cc:80
+#: dselect/helpmsgs.cc
 msgid "Introduction to read-only package list browser"
 msgstr "Úvod do prohlížeče seznamu balíků (přístup pouze pro čtení)"
 
-#: dselect/helpmsgs.cc:80
+#: dselect/helpmsgs.cc
 msgid ""
 "Welcome to dselect's main package listing.\n"
 "\n"
@@ -435,12 +435,12 @@ msgstr ""
 "\n"
 "Klávesou <mezera> opustíte nápovědu a dostanete se do seznamu.\n"
 
-#: dselect/helpmsgs.cc:99
+#: dselect/helpmsgs.cc
 msgid "Introduction to conflict/dependency resolution sub-list"
 msgstr ""
 "Úvod do práce s podseznamem pro řešení problémů s konflikty a závislostmi"
 
-#: dselect/helpmsgs.cc:99
+#: dselect/helpmsgs.cc
 msgid ""
 "Dependency/conflict resolution - introduction.\n"
 "\n"
@@ -501,11 +501,11 @@ msgstr ""
 "Klávesou <mezera> opustíte nápovědu a dostanete se do podseznamu.\n"
 "Nezapomeňte: nápovědu získáte stiskem `?'.\n"
 
-#: dselect/helpmsgs.cc:125
+#: dselect/helpmsgs.cc
 msgid "Display, part 1: package listing and status chars"
 msgstr "Zobrazení, část 1: seznam balíků a stavové znaky"
 
-#: dselect/helpmsgs.cc:125
+#: dselect/helpmsgs.cc
 msgid ""
 "The top half of the screen shows a list of packages.  For each package you "
 "see\n"
@@ -564,11 +564,11 @@ msgstr ""
 "Pro každý balík se též zobrazuje jeho priorita, stav, jméno, stav instalace\n"
 "a dostupné verze (lze zobrazit/skrýt pomocí velkého `V') a stručný popis.\n"
 
-#: dselect/helpmsgs.cc:152
+#: dselect/helpmsgs.cc
 msgid "Display, part 2: list highlight; information display"
 msgstr "Zobrazení, část 2: zvýraznění; informační obrazovka"
 
-#: dselect/helpmsgs.cc:152
+#: dselect/helpmsgs.cc
 msgid ""
 "* Highlight: One line in the package list will be highlighted.  It "
 "indicates\n"
@@ -616,11 +616,11 @@ msgstr ""
 "`I'\n"
 "  pak můžete schovat nebo roztáhnout část obrazovky s informacemi.\n"
 
-#: dselect/helpmsgs.cc:176
+#: dselect/helpmsgs.cc
 msgid "Introduction to method selection display"
 msgstr "Úvod do výběru přístupové metody"
 
-#: dselect/helpmsgs.cc:176
+#: dselect/helpmsgs.cc
 msgid ""
 "dselect and dpkg can do automatic installation, loading the package files to "
 "be\n"
@@ -663,11 +663,11 @@ msgstr ""
 "`k',\n"
 "nebo z nabídky nápovědy dostupné klávesou `?'.\n"
 
-#: dselect/helpmsgs.cc:196
+#: dselect/helpmsgs.cc
 msgid "Keystrokes for method selection"
 msgstr "Klávesy pro volbu metody"
 
-#: dselect/helpmsgs.cc:196
+#: dselect/helpmsgs.cc
 msgid ""
 "Motion keys: Next/Previous, Top/End, Up/Down, Backwards/Forwards:\n"
 "  j, Down-arrow         k, Up-arrow             move highlight\n"
@@ -715,104 +715,104 @@ msgstr ""
 "  /                hledá (zrušení stiskem Return)\n"
 "  \\                opakuje poslední hledání\n"
 
-#: dselect/main.cc:63
+#: dselect/main.cc
 msgid "Type dselect --help for help."
 msgstr "Pro získání nápovědy napište dselect --help."
 
-#: dselect/main.cc:145
+#: dselect/main.cc
 msgid "a"
 msgstr "p"
 
-#: dselect/main.cc:145
+#: dselect/main.cc
 msgid "[A]ccess"
 msgstr "[P]řístup"
 
-#: dselect/main.cc:145
+#: dselect/main.cc
 msgid "Choose the access method to use."
 msgstr "Volba přístupové metody."
 
-#: dselect/main.cc:146
+#: dselect/main.cc
 msgid "u"
 msgstr "a"
 
-#: dselect/main.cc:146
+#: dselect/main.cc
 msgid "[U]pdate"
 msgstr "[A]ktualizuj"
 
-#: dselect/main.cc:146
+#: dselect/main.cc
 msgid "Update list of available packages, if possible."
 msgstr "Aktualizace informací o dostupných balících."
 
-#: dselect/main.cc:147
+#: dselect/main.cc
 msgid "s"
 msgstr "v"
 
-#: dselect/main.cc:147
+#: dselect/main.cc
 msgid "[S]elect"
 msgstr "[V]yber"
 
-#: dselect/main.cc:147
+#: dselect/main.cc
 msgid "Request which packages you want on your system."
 msgstr "Výběr balíků pro instalaci a odinstalaci."
 
-#: dselect/main.cc:148
+#: dselect/main.cc
 msgid "i"
 msgstr "n"
 
-#: dselect/main.cc:148
+#: dselect/main.cc
 msgid "[I]nstall"
 msgstr "[N]ainstaluj"
 
-#: dselect/main.cc:148
+#: dselect/main.cc
 msgid "Install and upgrade wanted packages."
 msgstr "Instalace a aktualizace vybraných balíků."
 
-#: dselect/main.cc:149
+#: dselect/main.cc
 msgid "c"
 msgstr "k"
 
-#: dselect/main.cc:149
+#: dselect/main.cc
 msgid "[C]onfig"
 msgstr "[K]konfiguruj"
 
-#: dselect/main.cc:149
+#: dselect/main.cc
 msgid "Configure any packages that are unconfigured."
 msgstr "Konfigurace všech nezkonfigurovaných balíků."
 
-#: dselect/main.cc:150
+#: dselect/main.cc
 msgid "r"
 msgstr "o"
 
-#: dselect/main.cc:150
+#: dselect/main.cc
 msgid "[R]emove"
 msgstr "[O]dstraň"
 
-#: dselect/main.cc:150
+#: dselect/main.cc
 msgid "Remove unwanted software."
 msgstr "Odebrání nežádoucích balíků."
 
-#: dselect/main.cc:151
+#: dselect/main.cc
 msgid "q"
 msgstr "u"
 
-#: dselect/main.cc:151
+#: dselect/main.cc
 msgid "[Q]uit"
 msgstr "[U]končit"
 
-#: dselect/main.cc:151
+#: dselect/main.cc
 msgid "Quit dselect."
 msgstr "Ukončení dselectu."
 
-#: dselect/main.cc:152
+#: dselect/main.cc
 msgid "menu"
 msgstr "menu"
 
-#: dselect/main.cc:157
+#: dselect/main.cc
 #, c-format
 msgid "Debian `%s' package handling frontend version %s.\n"
 msgstr "Debian `%s' rozhraní pro správu balíků verze %s.\n"
 
-#: dselect/main.cc:160
+#: dselect/main.cc
 msgid ""
 "This is free software; see the GNU General Public License version 2 or\n"
 "later for copying conditions. There is NO warranty.\n"
@@ -821,29 +821,47 @@ msgstr ""
 "v GNU GPL (GNU General Public License) verze 2 nebo pozdější.\n"
 "Toto programové vybavení je absolutně bez záruky.\n"
 
-#: dselect/main.cc:169 dselect/main.cc:217
+#: dselect/main.cc
 msgid "<standard output>"
 msgstr "<standardní výstup>"
 
-#: dselect/main.cc:180
-#, c-format
+#: dselect/main.cc
+#, fuzzy, c-format
+#| msgid ""
+#| "Usage: %s [<option> ...] [<action> ...]\n"
+#| "\n"
 msgid ""
-"Usage: %s [<option> ...] [<action> ...]\n"
+"Usage: %s [<option>...] [<command>...]\n"
 "\n"
 msgstr ""
 "Použití: %s [<volba> ...] [<akce> ...]\n"
 "\n"
 
-#: dselect/main.cc:184
+#: dselect/main.cc
 #, c-format
+msgid "Commands:\n"
+msgstr ""
+
+#: dselect/main.cc
+#, fuzzy, c-format
+#| msgid ""
+#| "Options:\n"
+#| "  --admindir <directory>     Use <directory> instead of %s.\n"
+#| "  --expert                   Turn on expert mode.\n"
+#| "  --debug <file> | -D<file>  Turn on debugging, sending output to "
+#| "<file>.\n"
+#| "  --colour | --color screenpart:[foreground],[background][:attr[+attr"
+#| "+...]]\n"
+#| "                             Configure screen colours.\n"
+#| "\n"
 msgid ""
 "Options:\n"
-"  --admindir <directory>     Use <directory> instead of %s.\n"
-"  --expert                   Turn on expert mode.\n"
-"  --debug <file> | -D<file>  Turn on debugging, sending output to <file>.\n"
-"  --colour | --color screenpart:[foreground],[background][:attr[+attr+...]]\n"
-"                             Configure screen colours.\n"
-"\n"
+"      --admindir <directory>       Use <directory> instead of %s.\n"
+"      --expert                     Turn on expert mode.\n"
+"  -D, --debug <file>               Turn on debugging, send output to "
+"<file>.\n"
+"      --color <color-spec>         Configure screen colors.\n"
+"      --colour <color-spec>        Ditto.\n"
 msgstr ""
 "Volby:\n"
 "  --admindir <adresář>       Místo %s použije <adresář>.\n"
@@ -853,72 +871,79 @@ msgstr ""
 "                             Nastaví barvy.\n"
 "\n"
 
-#: dselect/main.cc:193
-#, c-format
+#: dselect/main.cc
+#, fuzzy, c-format
+#| msgid ""
+#| "  --help                     Show this help message.\n"
+#| "  --version                  Show the version.\n"
+#| "\n"
 msgid ""
-"  --help                     Show this help message.\n"
-"  --version                  Show the version.\n"
+"  -?, --help                       Show this help message.\n"
+"      --version                    Show the version.\n"
 "\n"
 msgstr ""
 "  --help                     Zobrazí tuto nápovědu.\n"
 "  --version                  Zobrazí verzi.\n"
 "\n"
 
-#: dselect/main.cc:197
+#: dselect/main.cc
 #, c-format
-msgid "Actions:\n"
-msgstr "Akce:\n"
+msgid ""
+"<color-spec> is <screen-part>:[<foreground>],[<background>][:"
+"<attr>[+<attr>]...]\n"
+msgstr ""
 
-#: dselect/main.cc:202
-#, c-format
-msgid "Screenparts:\n"
+#: dselect/main.cc
+#, fuzzy, c-format
+#| msgid "Screenparts:\n"
+msgid "<screen-part> is:"
 msgstr "Části obrazovky:\n"
 
-#: dselect/main.cc:207
+#: dselect/main.cc
 #, c-format
-msgid "Colours:\n"
-msgstr "Barvy:\n"
+msgid "<color> is:"
+msgstr ""
 
-#: dselect/main.cc:212
+#: dselect/main.cc
 #, c-format
-msgid "Attributes:\n"
-msgstr "Atributy:\n"
+msgid "<attr> is:"
+msgstr ""
 
-#: dselect/main.cc:232
+#: dselect/main.cc
 #, c-format
 msgid "couldn't open debug file `%.255s'\n"
 msgstr "nepodařilo se otevřít ladící soubor `%.255s'\n"
 
-#: dselect/main.cc:253
+#: dselect/main.cc
 #, c-format
 msgid "invalid %s '%s'"
 msgstr "neplatné %s '%s'"
 
-#: dselect/main.cc:272
+#: dselect/main.cc
 msgid "screen part"
 msgstr "část obrazovky"
 
-#: dselect/main.cc:278
+#: dselect/main.cc
 msgid "null colour specification"
 msgstr "zadání prázdné barvy"
 
-#: dselect/main.cc:286 dselect/main.cc:291
+#: dselect/main.cc
 msgid "colour"
 msgstr "barva"
 
-#: dselect/main.cc:299
+#: dselect/main.cc
 msgid "colour attribute"
 msgstr "atribut barvy"
 
-#: dselect/main.cc:333
+#: dselect/main.cc
 msgid "Terminal does not appear to support cursor addressing.\n"
 msgstr "Zdá se, že terminál nepodporuje adresaci kurzoru.\n"
 
-#: dselect/main.cc:335
+#: dselect/main.cc
 msgid "Terminal does not appear to support highlighting.\n"
 msgstr "Zdá se, že terminál nepodporuje zvýrazňování.\n"
 
-#: dselect/main.cc:337
+#: dselect/main.cc
 #, c-format
 msgid ""
 "Set your TERM variable correctly, use a better terminal,\n"
@@ -927,11 +952,11 @@ msgstr ""
 "Nastavte správně proměnnou TERM, použijte lepší terminál\n"
 "nebo použijte nástroj pro správu jednotlivých balíků %s.\n"
 
-#: dselect/main.cc:340
+#: dselect/main.cc
 msgid "terminal lacks necessary features, giving up"
 msgstr "terminál postrádá nezbytné funkce, vzdávám to"
 
-#: dselect/main.cc:425
+#: dselect/main.cc
 msgid ""
 "\n"
 "\n"
@@ -946,7 +971,7 @@ msgstr ""
 "číslic; Volbu potvrďte stiskem klávesy <enter>. Obrazovku překreslí ^L.\n"
 "\n"
 
-#: dselect/main.cc:430
+#: dselect/main.cc
 msgid ""
 "Copyright (C) 1994-1996 Ian Jackson.\n"
 "Copyright (C) 2000,2001 Wichert Akkerman.\n"
@@ -954,7 +979,7 @@ msgstr ""
 "Copyright (C) 1994-1996 Ian Jackson.\n"
 "Copyright (C) 2000,2001 Wichert Akkerman.\n"
 
-#: dselect/main.cc:436
+#: dselect/main.cc
 msgid ""
 "\n"
 "\n"
@@ -964,57 +989,57 @@ msgstr ""
 "\n"
 "Přístup pouze pro čtení: k dispozici je pouze přehled aktuálních nastavení!"
 
-#: dselect/main.cc:455
+#: dselect/main.cc
 msgid "failed to getch in main menu"
 msgstr "nepovedlo se getch v hlavním menu"
 
-#: dselect/main.cc:538
+#: dselect/main.cc
 #, c-format
 msgid "unknown action string `%.50s'"
 msgstr "neznámý akční řetězec `%.50s'"
 
-#: dselect/methlist.cc:66
+#: dselect/methlist.cc
 msgid "Abbrev."
 msgstr "Zkratka"
 
-#: dselect/methlist.cc:67 dselect/pkgdisplay.cc:188 dselect/pkginfo.cc:110
+#: dselect/methlist.cc dselect/pkgdisplay.cc dselect/pkginfo.cc
 msgid "Description"
 msgstr "Popis"
 
-#: dselect/methlist.cc:73
+#: dselect/methlist.cc
 msgid "dselect - list of access methods"
 msgstr "dselect - seznam přístupových metod"
 
-#: dselect/methlist.cc:82
+#: dselect/methlist.cc
 #, c-format
 msgid "Access method `%s'."
 msgstr "Přístupová metoda `%s'."
 
-#: dselect/methlist.cc:161 dselect/pkglist.cc:587
+#: dselect/methlist.cc dselect/pkglist.cc
 msgid "doupdate failed"
 msgstr "nepovedlo se doupdate"
 
-#: dselect/methlist.cc:164 dselect/pkglist.cc:590
+#: dselect/methlist.cc dselect/pkglist.cc
 msgid "failed to unblock SIGWINCH"
 msgstr "nepovedlo se odblokovat SIGWINCH"
 
-#: dselect/methlist.cc:169 dselect/pkglist.cc:595
+#: dselect/methlist.cc dselect/pkglist.cc
 msgid "failed to re-block SIGWINCH"
 msgstr "nepovedlo se znovu zablokovat SIGWINCH"
 
-#: dselect/methlist.cc:170 dselect/pkglist.cc:597
+#: dselect/methlist.cc dselect/pkglist.cc
 msgid "getch failed"
 msgstr "nepovedlo se getch"
 
-#: dselect/methlist.cc:187
+#: dselect/methlist.cc
 msgid "Explanation"
 msgstr "Vysvětlení"
 
-#: dselect/methlist.cc:197
+#: dselect/methlist.cc
 msgid "No explanation available."
 msgstr "Vysvětlení není k dispozici."
 
-#: dselect/method.cc:67
+#: dselect/method.cc
 #, c-format
 msgid ""
 "\n"
@@ -1025,7 +1050,7 @@ msgstr ""
 "\n"
 "%s: %s\n"
 
-#: dselect/method.cc:70
+#: dselect/method.cc
 msgid ""
 "\n"
 "Press <enter> to continue."
@@ -1033,185 +1058,195 @@ msgstr ""
 "\n"
 "Pokračujte stiskem klávesy <enter>."
 
-#: dselect/method.cc:82
+#: dselect/method.cc
 msgid "cannot unlock access method area"
 msgstr "nelze odemknout oblast přístupové metody"
 
-#: dselect/method.cc:96
+#: dselect/method.cc
 msgid "no access methods are available"
 msgstr "žádné přístupové metody nejsou dispozici"
 
-#: dselect/method.cc:115
+#: dselect/method.cc
 msgid "requested operation requires superuser privilege"
 msgstr "požadovaná operace vyžaduje správcovská oprávnění"
 
-#: dselect/method.cc:118
+#: dselect/method.cc
 msgid "cannot open or create access method lockfile"
 msgstr "nelze otevřít nebo vytvořit zámek přístupové metody"
 
-#: dselect/method.cc:125
+#: dselect/method.cc
 msgid "the access method area is already locked"
 msgstr "oblast přístupové metody je již uzamčena"
 
-#: dselect/method.cc:128
+#: dselect/method.cc
 msgid "cannot lock access method area"
 msgstr "nelze zamnkount oblast přístupové metody"
 
-#: dselect/method.cc:161
+#: dselect/method.cc
 #, c-format
 msgid "Press <enter> to continue.\n"
 msgstr "Pokračujte stiskem klávesy <enter>.\n"
 
-#: dselect/method.cc:162
+#: dselect/method.cc
 msgid "<standard error>"
 msgstr "<chybový výstup>"
 
-#: dselect/method.cc:165
+#: dselect/method.cc
 msgid "error reading acknowledgement of program failure message"
 msgstr "chyba při čtení potvrzení chybového hlášení programu"
 
-#: dselect/method.cc:187
+#: dselect/method.cc
 msgid "no access method is selected or configured"
 msgstr "žádná přístupová metoda není vybrána nebo nakonfigurována"
 
-#: dselect/method.cc:196
+#: dselect/method.cc
 msgid "update available list script"
 msgstr "skript pro aktualizaci seznamu dostupných balíků"
 
-#: dselect/method.cc:200
+#: dselect/method.cc
 msgid "installation script"
 msgstr "instalační skript"
 
-#: dselect/method.cc:246
+#: dselect/method.cc
 msgid "query/setup script"
 msgstr "dotazovací/nastavovací skript"
 
-#: dselect/methparse.cc:53
+#: dselect/methparse.cc
 #, c-format
 msgid "syntax error in method options file `%.250s' -- %s"
 msgstr "syntaktická chyba v konfiguračním souboru metody `%.250s' -- %s"
 
-#: dselect/methparse.cc:59
+#: dselect/methparse.cc
 #, c-format
 msgid "error reading options file `%.250s'"
 msgstr "chyba při čtení konfiguračního souboru `%.250s'"
 
-#: dselect/methparse.cc:93
+#: dselect/methparse.cc
 #, c-format
 msgid "unable to read `%.250s' directory for reading methods"
 msgstr "nebylo možno načíst čtecí metody v adresáři `%.250s'"
 
-#: dselect/methparse.cc:109
+#: dselect/methparse.cc
 #, c-format
 msgid "method `%.250s' has name that is too long (%d > %d characters)"
 msgstr "metoda `%.250s' má příliš dlouhé jméno (%d > %d znaků)"
 
-#: dselect/methparse.cc:120
+#: dselect/methparse.cc
 #, c-format
 msgid "unable to access method script `%.250s'"
 msgstr "nelze přistoupit ke skriptu metody `%.250s'"
 
-#: dselect/methparse.cc:126
+#: dselect/methparse.cc
 #, c-format
 msgid "unable to read method options file `%.250s'"
 msgstr "nebylo možno přečíst konfigurační soubor metody `%.250s'"
 
-#: dselect/methparse.cc:150
+#: dselect/methparse.cc
 msgid "non-digit where digit wanted"
 msgstr "nečíselný znak na místě očekávané číslice"
 
-#: dselect/methparse.cc:153
-msgid "EOF in index string"
+#: dselect/methparse.cc
+#, fuzzy
+#| msgid "EOF in index string"
+msgid "end of file in index string"
 msgstr "EOF v indexovém řetězci"
 
-#: dselect/methparse.cc:156
+#: dselect/methparse.cc
 msgid "index string too long"
 msgstr "indexový řetězec je příliš dlouhý"
 
-#: dselect/methparse.cc:159
+#: dselect/methparse.cc
 msgid "newline before option name start"
 msgstr "nový řádek před začátkem jména volby"
 
-#: dselect/methparse.cc:161
-msgid "EOF before option name start"
-msgstr "EOF před začátkem jména volby"
+#: dselect/methparse.cc
+#, fuzzy
+#| msgid "newline before option name start"
+msgid "end of file before option name start"
+msgstr "nový řádek před začátkem jména volby"
 
-#: dselect/methparse.cc:165
+#: dselect/methparse.cc
 msgid "nonalpha where option name start wanted"
 msgstr "nepísmenný znak před začátkem jména volby"
 
-#: dselect/methparse.cc:167
+#: dselect/methparse.cc
 msgid "non-alphanum in option name"
 msgstr "nealfanumerický znak ve jméně volby"
 
-#: dselect/methparse.cc:170
-msgid "EOF in option name"
+#: dselect/methparse.cc
+#, fuzzy
+#| msgid "EOF in option name"
+msgid "end of file in option name"
 msgstr "EOF ve jméně volby"
 
-#: dselect/methparse.cc:175
+#: dselect/methparse.cc
 msgid "newline before summary"
 msgstr "nový řádek před přehledem"
 
-#: dselect/methparse.cc:177
-msgid "EOF before summary"
-msgstr "EOF před přehledem"
+#: dselect/methparse.cc
+#, fuzzy
+#| msgid "newline before summary"
+msgid "end of file before summary"
+msgstr "nový řádek před přehledem"
 
-#: dselect/methparse.cc:183
-msgid "EOF in summary - missing newline"
+#: dselect/methparse.cc
+#, fuzzy
+#| msgid "EOF in summary - missing newline"
+msgid "end of file in summary - missing newline"
 msgstr "EOF v přehledu - chybějící nový řádek"
 
-#: dselect/methparse.cc:193
+#: dselect/methparse.cc
 #, c-format
 msgid "unable to open option description file `%.250s'"
 msgstr "nelze otevřít soubor s popisy `%.250s'"
 
-#: dselect/methparse.cc:197
+#: dselect/methparse.cc
 #, c-format
 msgid "unable to stat option description file `%.250s'"
 msgstr "nelze detekovat popisný soubor voleb `%.250s'"
 
-#: dselect/methparse.cc:201
+#: dselect/methparse.cc
 #, c-format
 msgid "failed to read option description file `%.250s'"
 msgstr "nebylo možno přečíst popisný soubor voleb `%.250s'"
 
-#: dselect/methparse.cc:204
+#: dselect/methparse.cc
 #, c-format
 msgid "error during read of option description file `%.250s'"
 msgstr "chyba při čtení popisného souboru voleb `%.250s'"
 
-#: dselect/methparse.cc:227
+#: dselect/methparse.cc
 #, c-format
 msgid "error during read of method options file `%.250s'"
 msgstr "chyba při čtení konfiguračního souboru metody `%.250s'"
 
-#: dselect/methparse.cc:250
+#: dselect/methparse.cc
 #, c-format
 msgid "unable to open current option file `%.250s'"
 msgstr "nelze otevřít aktuální konfigurační soubor `%.250s'"
 
-#: dselect/methparse.cc:286
+#: dselect/methparse.cc
 #, c-format
 msgid "unable to write new option to `%.250s'"
 msgstr "nelze zapsat nový konfigurační soubor `%.250s'"
 
-#: dselect/pkgdisplay.cc:36
+#: dselect/pkgdisplay.cc
 msgid "new package"
 msgstr "nový balík"
 
-#: dselect/pkgdisplay.cc:37
+#: dselect/pkgdisplay.cc
 msgid "install"
 msgstr "instalace"
 
-#: dselect/pkgdisplay.cc:38
+#: dselect/pkgdisplay.cc
 msgid "hold"
 msgstr "podržet"
 
-#: dselect/pkgdisplay.cc:39
+#: dselect/pkgdisplay.cc
 msgid "remove"
 msgstr "odebrání"
 
-#: dselect/pkgdisplay.cc:40
+#: dselect/pkgdisplay.cc
 msgid "purge"
 msgstr "vyčistit"
 
@@ -1219,327 +1254,321 @@ msgstr "vyčistit"
 #. * the empty string to store information about the translation. DO NOT
 #. * CHANGE THAT IN A TRANSLATION! The code really relies on that being
 #. * a single space.
-#: dselect/pkgdisplay.cc:47
+#: dselect/pkgdisplay.cc
 msgid " "
 msgstr " "
 
-#: dselect/pkgdisplay.cc:48
+#: dselect/pkgdisplay.cc
 msgid "REINSTALL"
 msgstr "PŘEINSTALOVAT"
 
-#: dselect/pkgdisplay.cc:51
+#: dselect/pkgdisplay.cc
 msgid "not installed"
 msgstr "nenainstalován"
 
-#: dselect/pkgdisplay.cc:52
+#: dselect/pkgdisplay.cc
 msgid "removed (configs remain)"
 msgstr "odinstalovaný (konfigurační soubory ponechány)"
 
-#: dselect/pkgdisplay.cc:53
+#: dselect/pkgdisplay.cc
 msgid "half installed"
 msgstr "zpola nainstalovaný"
 
-#: dselect/pkgdisplay.cc:54
+#: dselect/pkgdisplay.cc
 msgid "unpacked (not set up)"
 msgstr "rozbalený (nezkonfigurovaný)"
 
-#: dselect/pkgdisplay.cc:55
+#: dselect/pkgdisplay.cc
 msgid "half configured (config failed)"
 msgstr "zpola nastavený (konfigurace selhala)"
 
-#: dselect/pkgdisplay.cc:56
+#: dselect/pkgdisplay.cc
 msgid "awaiting trigger processing"
 msgstr "očekává zpracování spouštěčů"
 
-#: dselect/pkgdisplay.cc:57
+#: dselect/pkgdisplay.cc
 msgid "triggered"
 msgstr "spouštěč aktivován"
 
-#: dselect/pkgdisplay.cc:58
+#: dselect/pkgdisplay.cc
 msgid "installed"
 msgstr "nainstalován"
 
-#: dselect/pkgdisplay.cc:61
+#: dselect/pkgdisplay.cc
 msgid "Required"
 msgstr "Vyžadované"
 
-#: dselect/pkgdisplay.cc:62
+#: dselect/pkgdisplay.cc
 msgid "Important"
 msgstr "Důležité"
 
-#: dselect/pkgdisplay.cc:63
+#: dselect/pkgdisplay.cc
 msgid "Standard"
 msgstr "Standardní"
 
-#: dselect/pkgdisplay.cc:64
+#: dselect/pkgdisplay.cc
 msgid "Optional"
 msgstr "Volitelné"
 
-#: dselect/pkgdisplay.cc:65
+#: dselect/pkgdisplay.cc
 msgid "Extra"
 msgstr "Extra"
 
-#: dselect/pkgdisplay.cc:66
-msgid "!Bug!"
-msgstr "!Chyba!"
-
-#: dselect/pkgdisplay.cc:67
+#: dselect/pkgdisplay.cc
 msgid "Unclassified"
 msgstr "Neklasifikované"
 
-#: dselect/pkgdisplay.cc:70
+#: dselect/pkgdisplay.cc
 msgid "suggests"
 msgstr "navrhuje"
 
-#: dselect/pkgdisplay.cc:71
+#: dselect/pkgdisplay.cc
 msgid "recommends"
 msgstr "doporučuje"
 
-#: dselect/pkgdisplay.cc:72
+#: dselect/pkgdisplay.cc
 msgid "depends on"
 msgstr "závisí na"
 
-#: dselect/pkgdisplay.cc:73
+#: dselect/pkgdisplay.cc
 msgid "pre-depends on"
 msgstr "před-závisí na"
 
-#: dselect/pkgdisplay.cc:74
+#: dselect/pkgdisplay.cc
 msgid "breaks"
 msgstr "poruší"
 
-#: dselect/pkgdisplay.cc:75
+#: dselect/pkgdisplay.cc
 msgid "conflicts with"
 msgstr "je v konfliktu s"
 
-#: dselect/pkgdisplay.cc:76
+#: dselect/pkgdisplay.cc
 msgid "provides"
 msgstr "poskytuje"
 
-#: dselect/pkgdisplay.cc:77
+#: dselect/pkgdisplay.cc
 msgid "replaces"
 msgstr "nahrazuje"
 
-#: dselect/pkgdisplay.cc:78
+#: dselect/pkgdisplay.cc
 msgid "enhances"
 msgstr "vylepšuje"
 
-#: dselect/pkgdisplay.cc:81
+#: dselect/pkgdisplay.cc
 msgid "Req"
 msgstr "Vyž"
 
-#: dselect/pkgdisplay.cc:82
+#: dselect/pkgdisplay.cc
 msgid "Imp"
 msgstr "Důl"
 
-#: dselect/pkgdisplay.cc:83
+#: dselect/pkgdisplay.cc
 msgid "Std"
 msgstr "Std"
 
-#: dselect/pkgdisplay.cc:84
+#: dselect/pkgdisplay.cc
 msgid "Opt"
 msgstr "Vol"
 
-#: dselect/pkgdisplay.cc:85
+#: dselect/pkgdisplay.cc
 msgid "Xtr"
 msgstr "Ext"
 
-#: dselect/pkgdisplay.cc:86
+#: dselect/pkgdisplay.cc
 msgid "bUG"
 msgstr "CHB"
 
-#: dselect/pkgdisplay.cc:87
+#: dselect/pkgdisplay.cc
 msgid "?"
 msgstr "?"
 
-#: dselect/pkgdisplay.cc:95 dselect/pkgdisplay.cc:115
+#: dselect/pkgdisplay.cc
 msgid "Broken"
 msgstr "Poškozené"
 
-#: dselect/pkgdisplay.cc:96
+#: dselect/pkgdisplay.cc
 msgid "New"
 msgstr "Nové"
 
-#: dselect/pkgdisplay.cc:97
-msgid "Updated"
-msgstr "Aktualizované"
+#: dselect/pkgdisplay.cc
+msgid "Upgradable"
+msgstr ""
 
-#: dselect/pkgdisplay.cc:98
+#: dselect/pkgdisplay.cc
 msgid "Obsolete/local"
 msgstr "Zastaralé/lokální"
 
-#: dselect/pkgdisplay.cc:99
-msgid "Up-to-date"
-msgstr "Aktuální"
+#: dselect/pkgdisplay.cc
+msgid "Installed"
+msgstr "Nainstalované"
 
-#: dselect/pkgdisplay.cc:100
+#: dselect/pkgdisplay.cc
 msgid "Available"
 msgstr "Dostupné"
 
-#: dselect/pkgdisplay.cc:101 dselect/pkgdisplay.cc:117
+#: dselect/pkgdisplay.cc
 msgid "Removed"
 msgstr "Odstraněné"
 
-#: dselect/pkgdisplay.cc:102 dselect/pkgdisplay.cc:111
+#: dselect/pkgdisplay.cc
 msgid "Brokenly installed packages"
 msgstr "Chybně nainstalované balíky"
 
-#: dselect/pkgdisplay.cc:103
+#: dselect/pkgdisplay.cc
 msgid "Newly available packages"
 msgstr "Nově dostupné balíky"
 
-#: dselect/pkgdisplay.cc:104
-msgid "Updated packages (newer version is available)"
-msgstr "Aktualizované balíky (je k dispozici nová verze)"
+#: dselect/pkgdisplay.cc
+#, fuzzy
+#| msgid "Newly available packages"
+msgid "Upgradable packages"
+msgstr "Nově dostupné balíky"
 
-#: dselect/pkgdisplay.cc:105
-msgid "Obsolete and local packages present on system"
+#: dselect/pkgdisplay.cc
+#, fuzzy
+#| msgid "Obsolete and local packages present on system"
+msgid "Obsolete and locally created packages"
 msgstr "Zastaralé a lokální balíky v systému"
 
-#: dselect/pkgdisplay.cc:106
-msgid "Up to date installed packages"
-msgstr "Aktuální nainstalované balíky"
+#: dselect/pkgdisplay.cc
+msgid "Installed packages"
+msgstr "Nainstalované balíky"
 
-#: dselect/pkgdisplay.cc:107
-msgid "Available packages (not currently installed)"
-msgstr "Dostupné balíky (momentálně nenainstalované)"
+#: dselect/pkgdisplay.cc
+#, fuzzy
+#| msgid "Up to date installed packages"
+msgid "Available not installed packages"
+msgstr "Aktuální nainstalované balíky"
 
-#: dselect/pkgdisplay.cc:108
+#: dselect/pkgdisplay.cc
 msgid "Removed and no longer available packages"
 msgstr "Odstraněné a již nedostupné balíky"
 
-#: dselect/pkgdisplay.cc:112
-msgid "Installed packages"
-msgstr "Nainstalované balíky"
-
-#: dselect/pkgdisplay.cc:113
+#: dselect/pkgdisplay.cc
 msgid "Removed packages (configuration still present)"
 msgstr "Odstraněné balíky (konfigurace zatím zachována)"
 
-#: dselect/pkgdisplay.cc:114
+#: dselect/pkgdisplay.cc
 msgid "Purged packages and those never installed"
 msgstr "Vyčištěné a nikdy nenainstalované balíky"
 
-#: dselect/pkgdisplay.cc:116
-msgid "Installed"
-msgstr "Nainstalované"
-
-#: dselect/pkgdisplay.cc:118
+#: dselect/pkgdisplay.cc
 msgid "Purged"
 msgstr "Vyčištěné"
 
-#: dselect/pkgdisplay.cc:138
+#: dselect/pkgdisplay.cc
 msgid "Error"
 msgstr "Chyba"
 
-#: dselect/pkgdisplay.cc:139
+#: dselect/pkgdisplay.cc
 msgid "Installed?"
 msgstr "Nainstalován?"
 
-#: dselect/pkgdisplay.cc:140
+#: dselect/pkgdisplay.cc
 msgid "Old mark"
 msgstr "Stará značka"
 
-#: dselect/pkgdisplay.cc:141
+#: dselect/pkgdisplay.cc
 msgid "Marked for"
 msgstr "Označen pro"
 
-#: dselect/pkgdisplay.cc:143
+#: dselect/pkgdisplay.cc
 msgid "EIOM"
 msgstr "EIOM"
 
-#: dselect/pkgdisplay.cc:147 dselect/pkgdisplay.cc:150
+#: dselect/pkgdisplay.cc
 msgid "Section"
 msgstr "Sekce"
 
-#: dselect/pkgdisplay.cc:148
+#: dselect/pkgdisplay.cc
 msgid "Priority"
 msgstr "Priorita"
 
-#: dselect/pkgdisplay.cc:152
+#: dselect/pkgdisplay.cc
 msgid "Package"
 msgstr "Balík"
 
-#: dselect/pkgdisplay.cc:161 dselect/pkgdisplay.cc:165
+#: dselect/pkgdisplay.cc
 msgid "Avail.arch"
 msgstr "Dostup.arch"
 
-#: dselect/pkgdisplay.cc:164
+#: dselect/pkgdisplay.cc
 msgid "Inst.arch"
 msgstr "Inst.arch"
 
-#: dselect/pkgdisplay.cc:178 dselect/pkgdisplay.cc:182
+#: dselect/pkgdisplay.cc
 msgid "Avail.ver"
 msgstr "Dostup.ver"
 
-#: dselect/pkgdisplay.cc:181
+#: dselect/pkgdisplay.cc
 msgid "Inst.ver"
 msgstr "Inst.ver"
 
-#: dselect/pkgdisplay.cc:197
+#: dselect/pkgdisplay.cc
 msgid "dselect - recursive package listing"
 msgstr "dselect - rekurzivní výpis balíků"
 
-#: dselect/pkgdisplay.cc:199
+#: dselect/pkgdisplay.cc
 msgid "dselect - inspection of package states"
 msgstr "dselect - inspekce stavů balíků"
 
-#: dselect/pkgdisplay.cc:200
+#: dselect/pkgdisplay.cc
 msgid "dselect - main package listing"
 msgstr "dselect - hlavní seznam balíků"
 
-#: dselect/pkgdisplay.cc:208
+#: dselect/pkgdisplay.cc
 msgid " (by section)"
 msgstr " (podle sekce)"
 
-#: dselect/pkgdisplay.cc:211
+#: dselect/pkgdisplay.cc
 msgid " (avail., section)"
 msgstr " (dostup., sekce)"
 
-#: dselect/pkgdisplay.cc:214
+#: dselect/pkgdisplay.cc
 msgid " (status, section)"
 msgstr " (stav, sekce)"
 
-#: dselect/pkgdisplay.cc:223
+#: dselect/pkgdisplay.cc
 msgid " (by priority)"
 msgstr " (podle priority)"
 
-#: dselect/pkgdisplay.cc:226
+#: dselect/pkgdisplay.cc
 msgid " (avail., priority)"
 msgstr " (dostup., priorita)"
 
-#: dselect/pkgdisplay.cc:229
+#: dselect/pkgdisplay.cc
 msgid " (status, priority)"
 msgstr " (stav, priorita)"
 
-#: dselect/pkgdisplay.cc:238
+#: dselect/pkgdisplay.cc
 msgid " (alphabetically)"
 msgstr " (abecedně)"
 
-#: dselect/pkgdisplay.cc:241
+#: dselect/pkgdisplay.cc
 msgid " (by availability)"
 msgstr " (podle dostupnosti)"
 
-#: dselect/pkgdisplay.cc:244
+#: dselect/pkgdisplay.cc
 msgid " (by status)"
 msgstr " (podle stavu)"
 
-#: dselect/pkgdisplay.cc:259
+#: dselect/pkgdisplay.cc
 msgid " mark:+/=/- terse:v help:?"
 msgstr " znač:+/=/- struč:v pomoc:?"
 
-#: dselect/pkgdisplay.cc:260
+#: dselect/pkgdisplay.cc
 msgid " mark:+/=/- verbose:v help:?"
 msgstr " znač:+/=/- podrob:v pomoc:?"
 
-#: dselect/pkgdisplay.cc:262
+#: dselect/pkgdisplay.cc
 msgid " terse:v help:?"
 msgstr " struč:v pomoc:?"
 
-#: dselect/pkgdisplay.cc:263
+#: dselect/pkgdisplay.cc
 msgid " verbose:v help:?"
 msgstr " podrob:v pomoc:?"
 
-#: dselect/pkginfo.cc:85
+#: dselect/pkginfo.cc
 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 "
@@ -1559,80 +1588,110 @@ msgstr ""
 "Pořadí třídění balíků lze změnit klávesami `o' a `O', což vám umožní označit "
 "balíky v různých typech skupin."
 
-#: dselect/pkginfo.cc:98
+#: dselect/pkginfo.cc
 msgid "Interrelationships"
 msgstr "Vzájemné vztahy"
 
-#: dselect/pkginfo.cc:117
+#: dselect/pkginfo.cc
 msgid "No description available."
 msgstr "Popis není k dispozici."
 
-#: dselect/pkginfo.cc:135
+#: dselect/pkginfo.cc
 msgid "Installed control file information"
 msgstr "Stav instalace podle souboru control"
 
-#: dselect/pkginfo.cc:151
+#: dselect/pkginfo.cc
 msgid "Available control file information"
 msgstr "Dostupné informace ze souboru control"
 
-#: dselect/pkglist.cc:425
+#: dselect/pkglist.cc
 msgid "there are no packages"
 msgstr "žádné balíky"
 
-#: dselect/pkglist.cc:521
+#: dselect/pkglist.cc
 msgid "invalid search option given"
 msgstr "zadána neplatná volba"
 
-#: dselect/pkglist.cc:536
+#: dselect/pkglist.cc
 msgid "error in regular expression"
 msgstr "chyba v regulárním výrazu"
 
-#: dselect/pkgsublist.cc:111
+#: dselect/pkgsublist.cc
 msgid " does not appear to be available\n"
 msgstr " není k dispozici\n"
 
-#: dselect/pkgsublist.cc:131
+#: dselect/pkgsublist.cc
 msgid " or "
 msgstr " nebo "
 
-#: dselect/pkgtop.cc:58
+#: dselect/pkgtop.cc
 msgid "All"
 msgstr "Všechny"
 
-#: dselect/pkgtop.cc:80
+#: dselect/pkgtop.cc
 msgid "All packages"
 msgstr "Všechny balíky"
 
-#: dselect/pkgtop.cc:84
+#: dselect/pkgtop.cc
 #, c-format
 msgid "%s packages without a section"
 msgstr "%s balíky bez uvedené sekce"
 
-#: dselect/pkgtop.cc:86
+#: dselect/pkgtop.cc
 #, c-format
 msgid "%s packages in section %s"
 msgstr "%s balíky v sekci %s"
 
-#: dselect/pkgtop.cc:92
+#: dselect/pkgtop.cc
 #, c-format
 msgid "%s %s packages"
 msgstr "%s %s balíky"
 
-#: dselect/pkgtop.cc:96
+#: dselect/pkgtop.cc
 #, c-format
 msgid "%s %s packages without a section"
 msgstr "%s %s bez uvedené sekce"
 
-#: dselect/pkgtop.cc:98
+#: dselect/pkgtop.cc
 #, c-format
 msgid "%s %s packages in section %s"
 msgstr "%s %s balíky v sekci %s"
 
-#: dselect/pkgtop.cc:119
+#: dselect/pkgtop.cc
 #, c-format
 msgid "%-*s %s%s%s;  %s (was: %s).  %s"
 msgstr "%-*s %s%s%s; %s (bylo: %s). %s"
 
+#~ msgid "Actions:\n"
+#~ msgstr "Akce:\n"
+
+#~ msgid "Colours:\n"
+#~ msgstr "Barvy:\n"
+
+#~ msgid "Attributes:\n"
+#~ msgstr "Atributy:\n"
+
+#~ msgid "EOF before option name start"
+#~ msgstr "EOF před začátkem jména volby"
+
+#~ msgid "EOF before summary"
+#~ msgstr "EOF před přehledem"
+
+#~ msgid "!Bug!"
+#~ msgstr "!Chyba!"
+
+#~ msgid "Updated"
+#~ msgstr "Aktualizované"
+
+#~ msgid "Up-to-date"
+#~ msgstr "Aktuální"
+
+#~ msgid "Updated packages (newer version is available)"
+#~ msgstr "Aktualizované balíky (je k dispozici nová verze)"
+
+#~ msgid "Available packages (not currently installed)"
+#~ msgstr "Dostupné balíky (momentálně nenainstalované)"
+
 #~ msgid "foreign architectures enabled but multi-arch is not supported"
 #~ msgstr "cizí architektury jsou povoleny, ale multi-arch není podporován"
 
diff --git a/dselect/po/da.po b/dselect/po/da.po
index b48a46cab..722bafadf 100644
--- a/dselect/po/da.po
+++ b/dselect/po/da.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dselect 1.17.22\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2014-12-23 18:12+0100\n"
+"POT-Creation-Date: 2015-04-06 09:37+0200\n"
 "PO-Revision-Date: 2014-11-27 02:33+0200\n"
 "Last-Translator: Joe Hansen <joedalton2@yahoo.dk>\n"
 "Language-Team: Danish <debian-l10n-danish@lists.debian.org>\n"
@@ -19,27 +19,27 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: dselect/basecmds.cc:125
+#: dselect/basecmds.cc
 msgid "Search for ? "
 msgstr "Søg efter ? "
 
-#: dselect/basecmds.cc:149
+#: dselect/basecmds.cc
 msgid "Error: "
 msgstr "Fejl: "
 
-#: dselect/basecmds.cc:180
+#: dselect/basecmds.cc
 msgid "Help: "
 msgstr "Hjælp: "
 
-#: dselect/basecmds.cc:186
+#: dselect/basecmds.cc
 msgid "Press ? for help menu, . for next topic, <space> to exit help."
 msgstr "Tryk ? for hjælpemenu, . for næste emne, <mellemrum> afslutter hjælp."
 
-#: dselect/basecmds.cc:193
+#: dselect/basecmds.cc
 msgid "Help information is available under the following topics:"
 msgstr "Hjælpetekster for følgende emner er tilgængelige:"
 
-#: dselect/basecmds.cc:201
+#: dselect/basecmds.cc
 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. "
@@ -47,239 +47,239 @@ msgstr ""
 "Tryk en tast fra ovenstående liste, <mellemrum> eller »q« for at afslutte\n"
 "  hjælpen eller punktum for at læse hjælpesiderne en ad gangen. "
 
-#: dselect/basecmds.cc:207
+#: dselect/basecmds.cc
 msgid "error reading keyboard in help"
 msgstr "fejl ved læsning fra tastatur i hjælp"
 
-#: dselect/baselist.cc:60
+#: dselect/baselist.cc
 msgid "ioctl(TIOCGWINSZ) failed"
 msgstr "ioctl(TIOCGWINSZ) fejlede"
 
-#: dselect/baselist.cc:63
+#: dselect/baselist.cc
 msgid "doupdate in SIGWINCH handler failed"
 msgstr "doupdate i SIGWINCH-håndtering fejlede"
 
-#: dselect/baselist.cc:72
+#: dselect/baselist.cc
 msgid "failed to restore old SIGWINCH sigact"
 msgstr "kunne ikke genskabe gammel SIGWINCH sigact"
 
-#: dselect/baselist.cc:75
+#: dselect/baselist.cc
 msgid "failed to restore old signal mask"
 msgstr "kunne ikke genskabe gammel signalmaske"
 
-#: dselect/baselist.cc:86
+#: dselect/baselist.cc
 msgid "failed to get old signal mask"
 msgstr "kunne ikke få gammel signalmaske"
 
-#: dselect/baselist.cc:88
+#: dselect/baselist.cc
 msgid "failed to get old SIGWINCH sigact"
 msgstr "kunne ikke få gammel SIGWINCH sigact"
 
-#: dselect/baselist.cc:93
+#: dselect/baselist.cc
 msgid "failed to block SIGWINCH"
 msgstr "kunne ikke blokere SIGWINCH"
 
-#: dselect/baselist.cc:99
+#: dselect/baselist.cc
 msgid "failed to set new SIGWINCH sigact"
 msgstr "kunne ikke sætte ny SIGWINCH sigact"
 
-#: dselect/baselist.cc:174
+#: dselect/baselist.cc
 msgid "failed to allocate colour pair"
 msgstr "kunne ikke frigøre farvepar"
 
-#: dselect/baselist.cc:203
+#: dselect/baselist.cc
 msgid "failed to create title window"
 msgstr "kunne ikke oprette titelvindue"
 
-#: dselect/baselist.cc:207
+#: dselect/baselist.cc
 msgid "failed to create whatinfo window"
 msgstr "kunne ikke oprette whatinfo-flig"
 
-#: dselect/baselist.cc:211
+#: dselect/baselist.cc
 msgid "failed to create baselist pad"
 msgstr "kunne ikke oprette basisliste-flig"
 
-#: dselect/baselist.cc:214
+#: dselect/baselist.cc
 msgid "failed to create heading pad"
 msgstr "kunne ikke oprette overskrifts-flig"
 
-#: dselect/baselist.cc:218
+#: dselect/baselist.cc
 msgid "failed to create thisstate pad"
 msgstr "kunne ikke oprette dennestatus-flig"
 
-#: dselect/baselist.cc:222
+#: dselect/baselist.cc
 msgid "failed to create info pad"
 msgstr "kunne ikke oprette infoflig"
 
-#: dselect/baselist.cc:227
+#: dselect/baselist.cc
 msgid "failed to create query window"
 msgstr "kunne ikke oprette forespørgselsvindue"
 
-#: dselect/baselist.cc:298
+#: dselect/baselist.cc
 msgid "Keybindings"
 msgstr "Tastebindinger"
 
-#: dselect/baselist.cc:347
+#: dselect/baselist.cc
 #, c-format
 msgid "  -- %d%%, press "
 msgstr "  -- %d%%, tryk "
 
-#: dselect/baselist.cc:350
+#: dselect/baselist.cc
 #, c-format
 msgid "%s for more"
 msgstr "%s for mere"
 
-#: dselect/baselist.cc:354
+#: dselect/baselist.cc
 #, c-format
 msgid "%s to go back"
 msgstr "%s for at gå tilbage"
 
-#: dselect/bindings.cc:78
+#: dselect/bindings.cc
 msgid "[not bound]"
 msgstr "[ikke bundet]"
 
-#: dselect/bindings.cc:82
+#: dselect/bindings.cc
 #, c-format
 msgid "[unk: %d]"
 msgstr "[ukendt: %d]"
 
-#: dselect/bindings.cc:141
+#: dselect/bindings.cc
 msgid "Scroll onwards through help/information"
 msgstr "Rul forlæns gennem hjælp/information"
 
-#: dselect/bindings.cc:142
+#: dselect/bindings.cc
 msgid "Scroll backwards through help/information"
 msgstr "Rul baglæns gennem hjælp/information"
 
-#: dselect/bindings.cc:143
+#: dselect/bindings.cc
 msgid "Move up"
 msgstr "Flyt opad"
 
-#: dselect/bindings.cc:144
+#: dselect/bindings.cc
 msgid "Move down"
 msgstr "Flyt nedad"
 
-#: dselect/bindings.cc:145
+#: dselect/bindings.cc
 msgid "Go to top of list"
 msgstr "Gå til toppen af listen"
 
-#: dselect/bindings.cc:146
+#: dselect/bindings.cc
 msgid "Go to end of list"
 msgstr "Gå til slutningen af listen"
 
-#: dselect/bindings.cc:147
+#: dselect/bindings.cc
 msgid "Request help (cycle through help screens)"
 msgstr "Få hjælp (skift hjælpeskærm)"
 
-#: dselect/bindings.cc:148
+#: dselect/bindings.cc
 msgid "Cycle through information displays"
 msgstr "Skift informationsvisning"
 
-#: dselect/bindings.cc:149
+#: dselect/bindings.cc
 msgid "Redraw display"
 msgstr "Gentegn skærm"
 
-#: dselect/bindings.cc:150
+#: dselect/bindings.cc
 msgid "Scroll onwards through list by 1 line"
 msgstr "Rul 1 linje videre i listen"
 
-#: dselect/bindings.cc:151
+#: dselect/bindings.cc
 msgid "Scroll backwards through list by 1 line"
 msgstr "Rul 1 linje bagud i listen"
 
-#: dselect/bindings.cc:152
+#: dselect/bindings.cc
 msgid "Scroll onwards through help/information by 1 line"
 msgstr "Rul 1 linje videre i hjælp/information"
 
-#: dselect/bindings.cc:153
+#: dselect/bindings.cc
 msgid "Scroll backwards through help/information by 1 line"
 msgstr "Rul 1 linje bagud i hjælp/information"
 
-#: dselect/bindings.cc:154
+#: dselect/bindings.cc
 msgid "Scroll onwards through list"
 msgstr "Rul videre i listen"
 
-#: dselect/bindings.cc:155
+#: dselect/bindings.cc
 msgid "Scroll backwards through list"
 msgstr "Rul baglæns i listen"
 
-#: dselect/bindings.cc:158
+#: dselect/bindings.cc
 msgid "Mark package(s) for installation"
 msgstr "Marker pakker for installation"
 
-#: dselect/bindings.cc:159
+#: dselect/bindings.cc
 msgid "Mark package(s) for deinstallation"
 msgstr "Marker pakker for afinstallering"
 
-#: dselect/bindings.cc:160
+#: dselect/bindings.cc
 msgid "Mark package(s) for deinstall and purge"
 msgstr "Marker pakker for afinstallering og udrensning"
 
-#: dselect/bindings.cc:161
+#: dselect/bindings.cc
 msgid "Make highlight more specific"
 msgstr "Gør markering mere specifik"
 
-#: dselect/bindings.cc:162
+#: dselect/bindings.cc
 msgid "Make highlight less specific"
 msgstr "Gør markering mindre specifik"
 
-#: dselect/bindings.cc:163
+#: dselect/bindings.cc
 msgid "Search for a package whose name contains a string"
 msgstr "Søg efter en pakke, der indeholder en streng"
 
-#: dselect/bindings.cc:164
+#: dselect/bindings.cc
 msgid "Repeat last search"
 msgstr "Gentag sidste søgning"
 
-#: dselect/bindings.cc:165
+#: dselect/bindings.cc
 msgid "Swap sort order priority/section"
 msgstr "Skift sorteringsrækkefølge-prioritet/gruppe"
 
-#: dselect/bindings.cc:166
+#: dselect/bindings.cc
 msgid "Quit, confirming, and checking dependencies"
 msgstr "Afslut bekræftende, og tjek afhængigheder"
 
-#: dselect/bindings.cc:167
+#: dselect/bindings.cc
 msgid "Quit, confirming without check"
 msgstr "Afslut bekræftende, uden tjek"
 
-#: dselect/bindings.cc:168
+#: dselect/bindings.cc
 msgid "Quit, rejecting conflict/dependency suggestions"
 msgstr "Afslut, afvis konflikt/afhængigheds-forslag"
 
-#: dselect/bindings.cc:169
+#: dselect/bindings.cc
 msgid "Abort - quit without making changes"
 msgstr "Afbryd - afslut uden at lave ændringer"
 
-#: dselect/bindings.cc:170
+#: dselect/bindings.cc
 msgid "Revert to old state for all packages"
 msgstr "Genskab tidligere status for alle pakker"
 
-#: dselect/bindings.cc:171
+#: dselect/bindings.cc
 msgid "Revert to suggested state for all packages"
 msgstr "Genskab foreslået status for alle pakker"
 
-#: dselect/bindings.cc:172
+#: dselect/bindings.cc
 msgid "Revert to directly requested state for all packages"
 msgstr "Genskab direkte angivet status for alle pakker"
 
-#: dselect/bindings.cc:173
+#: dselect/bindings.cc
 msgid "Revert to currently installed state for all packages"
 msgstr "Genskab til aktuelt installeret tilstand for alle pakker"
 
-#: dselect/bindings.cc:176
+#: dselect/bindings.cc
 msgid "Select currently-highlighted access method"
 msgstr "Vælg den markerede adgangsmetode"
 
-#: dselect/bindings.cc:177
+#: dselect/bindings.cc
 msgid "Quit without changing selected access method"
 msgstr "Afslut uden at ændre den valgte adgangsmetode"
 
-#: dselect/helpmsgs.cc:29
+#: dselect/helpmsgs.cc
 msgid "Keystrokes"
 msgstr "Taster"
 
-#: dselect/helpmsgs.cc:29
+#: dselect/helpmsgs.cc
 msgid ""
 "Motion keys: Next/Previous, Top/End, Up/Down, Backwards/Forwards:\n"
 "  j, Down-arrow         k, Up-arrow             move highlight\n"
@@ -337,11 +337,11 @@ msgstr ""
 "fortryde)\n"
 "   D     sæt alle til direkte ønsket status   n, \\  gentag sidste søgning\n"
 
-#: dselect/helpmsgs.cc:55
+#: dselect/helpmsgs.cc
 msgid "Introduction to package selections"
 msgstr "Introduktion til pakkevalg"
 
-#: dselect/helpmsgs.cc:55
+#: dselect/helpmsgs.cc
 msgid ""
 "Welcome to dselect's main package listing.\n"
 "\n"
@@ -398,11 +398,11 @@ msgstr ""
 "\n"
 "Tryk mellemrum for at forlade hjælpen og gå til listen.\n"
 
-#: dselect/helpmsgs.cc:80
+#: dselect/helpmsgs.cc
 msgid "Introduction to read-only package list browser"
 msgstr "Introduktion til skrivebeskyttet pakkeliste-søger"
 
-#: dselect/helpmsgs.cc:80
+#: dselect/helpmsgs.cc
 msgid ""
 "Welcome to dselect's main package listing.\n"
 "\n"
@@ -440,11 +440,11 @@ msgstr ""
 "\n"
 "Tryk <mellemrum> for at forlade hjælpen og gå til listen nu.\n"
 
-#: dselect/helpmsgs.cc:99
+#: dselect/helpmsgs.cc
 msgid "Introduction to conflict/dependency resolution sub-list"
 msgstr "Introduktion til konflikt/afhængighedsløsnings-dellisten"
 
-#: dselect/helpmsgs.cc:99
+#: dselect/helpmsgs.cc
 msgid ""
 "Dependency/conflict resolution - introduction.\n"
 "\n"
@@ -506,11 +506,11 @@ msgstr ""
 "Tryk mellemrum for at forlade hjælp og gå til dellisten. Husk: »?« for "
 "hjælp.\n"
 
-#: dselect/helpmsgs.cc:125
+#: dselect/helpmsgs.cc
 msgid "Display, part 1: package listing and status chars"
 msgstr "Visning, del 1: pakkeliste og statustegn"
 
-#: dselect/helpmsgs.cc:125
+#: dselect/helpmsgs.cc
 msgid ""
 "The top half of the screen shows a list of packages.  For each package you "
 "see\n"
@@ -572,11 +572,11 @@ msgstr ""
 "Også hver pakkes prioritet, gruppe, navn, versionsnumre for installeret og\n"
 "tilgængelig version (skift-V for vis/skjul) og kort beskrivelse vises.\n"
 
-#: dselect/helpmsgs.cc:152
+#: dselect/helpmsgs.cc
 msgid "Display, part 2: list highlight; information display"
 msgstr "Visning, del 2: listemarkering, informationsvisning"
 
-#: dselect/helpmsgs.cc:152
+#: dselect/helpmsgs.cc
 msgid ""
 "* Highlight: One line in the package list will be highlighted.  It "
 "indicates\n"
@@ -623,11 +623,11 @@ msgstr ""
 "  Brug tasten »i« for at skifte mellem visningerne og »I« for at gemme\n"
 "  informationsvisningen eller udvide den til næsten hele skærmen.\n"
 
-#: dselect/helpmsgs.cc:176
+#: dselect/helpmsgs.cc
 msgid "Introduction to method selection display"
 msgstr "Introduktion til metodevalgsvisningen"
 
-#: dselect/helpmsgs.cc:176
+#: dselect/helpmsgs.cc
 msgid ""
 "dselect and dpkg can do automatic installation, loading the package files to "
 "be\n"
@@ -671,11 +671,11 @@ msgstr ""
 "dem i\n"
 "hjælpemenuen ved at trykke »?«.\n"
 
-#: dselect/helpmsgs.cc:196
+#: dselect/helpmsgs.cc
 msgid "Keystrokes for method selection"
 msgstr "Taster til metodevalg"
 
-#: dselect/helpmsgs.cc:196
+#: dselect/helpmsgs.cc
 msgid ""
 "Motion keys: Next/Previous, Top/End, Up/Down, Backwards/Forwards:\n"
 "  j, Down-arrow         k, Up-arrow             move highlight\n"
@@ -721,104 +721,104 @@ msgstr ""
 "  /                søg (fortryd umiddelbart med retur)\n"
 "  \\                gentag sidste søgning\n"
 
-#: dselect/main.cc:63
+#: dselect/main.cc
 msgid "Type dselect --help for help."
 msgstr "Skriv »dselect --help« for hjælp."
 
-#: dselect/main.cc:145
+#: dselect/main.cc
 msgid "a"
 msgstr "t"
 
-#: dselect/main.cc:145
+#: dselect/main.cc
 msgid "[A]ccess"
 msgstr "[T]ilgang"
 
-#: dselect/main.cc:145
+#: dselect/main.cc
 msgid "Choose the access method to use."
 msgstr "Vælg den ønskede tilgangsmetode."
 
-#: dselect/main.cc:146
+#: dselect/main.cc
 msgid "u"
 msgstr "o"
 
-#: dselect/main.cc:146
+#: dselect/main.cc
 msgid "[U]pdate"
 msgstr "[O]pdater"
 
-#: dselect/main.cc:146
+#: dselect/main.cc
 msgid "Update list of available packages, if possible."
 msgstr "Opdater listen med tilgængelige pakker, hvis muligt."
 
-#: dselect/main.cc:147
+#: dselect/main.cc
 msgid "s"
 msgstr "u"
 
-#: dselect/main.cc:147
+#: dselect/main.cc
 msgid "[S]elect"
 msgstr "[U]dvælg"
 
-#: dselect/main.cc:147
+#: dselect/main.cc
 msgid "Request which packages you want on your system."
 msgstr "Udvælg, hvilke pakker, du ønsker på dit system."
 
-#: dselect/main.cc:148
+#: dselect/main.cc
 msgid "i"
 msgstr "i"
 
-#: dselect/main.cc:148
+#: dselect/main.cc
 msgid "[I]nstall"
 msgstr "[I]nstaller"
 
-#: dselect/main.cc:148
+#: dselect/main.cc
 msgid "Install and upgrade wanted packages."
 msgstr "Installer og opgrader ønskede pakker."
 
-#: dselect/main.cc:149
+#: dselect/main.cc
 msgid "c"
 msgstr "k"
 
-#: dselect/main.cc:149
+#: dselect/main.cc
 msgid "[C]onfig"
 msgstr "[K]onfig"
 
-#: dselect/main.cc:149
+#: dselect/main.cc
 msgid "Configure any packages that are unconfigured."
 msgstr "Konfigurer eventuelle ikke-konfigurerede pakker."
 
-#: dselect/main.cc:150
+#: dselect/main.cc
 msgid "r"
 msgstr "a"
 
-#: dselect/main.cc:150
+#: dselect/main.cc
 msgid "[R]emove"
 msgstr "[A]finstaller"
 
-#: dselect/main.cc:150
+#: dselect/main.cc
 msgid "Remove unwanted software."
 msgstr "Afinstaller uønskede programmer."
 
-#: dselect/main.cc:151
+#: dselect/main.cc
 msgid "q"
 msgstr "a"
 
-#: dselect/main.cc:151
+#: dselect/main.cc
 msgid "[Q]uit"
 msgstr "[A]fslut"
 
-#: dselect/main.cc:151
+#: dselect/main.cc
 msgid "Quit dselect."
 msgstr "Afslut dselect."
 
-#: dselect/main.cc:152
+#: dselect/main.cc
 msgid "menu"
 msgstr "menu"
 
-#: dselect/main.cc:157
+#: dselect/main.cc
 #, c-format
 msgid "Debian `%s' package handling frontend version %s.\n"
 msgstr "Debian »%s« pakkehåndteringsbrugerfladeversion %s.\n"
 
-#: dselect/main.cc:160
+#: dselect/main.cc
 msgid ""
 "This is free software; see the GNU General Public License version 2 or\n"
 "later for copying conditions. There is NO warranty.\n"
@@ -826,32 +826,50 @@ msgstr ""
 "Dette er frit programmel; se »GNU General Public License« version 2\n"
 "eller senere for forhold vedrørende kopiering. Der er INGEN garanti.\n"
 
-#: dselect/main.cc:169 dselect/main.cc:217
+#: dselect/main.cc
 msgid "<standard output>"
 msgstr "<standardud>"
 
-#: dselect/main.cc:180
-#, c-format
+#: dselect/main.cc
+#, fuzzy, c-format
+#| msgid ""
+#| "Usage: %s [<option> ...] [<action> ...]\n"
+#| "\n"
 msgid ""
-"Usage: %s [<option> ...] [<action> ...]\n"
+"Usage: %s [<option>...] [<command>...]\n"
 "\n"
 msgstr ""
 "Brug: %s [<tilvalg> ...] [<handling> ...]\n"
 "\n"
 
+#: dselect/main.cc
+#, c-format
+msgid "Commands:\n"
+msgstr ""
+
 # jeg kan ikke overskue den med color og screepart - om screenpart,
 # foreground og baggrund kan oversættes.  Det er nok bedst at beholde
 # dem i så fald
-#: dselect/main.cc:184
-#, c-format
+#: dselect/main.cc
+#, fuzzy, c-format
+#| msgid ""
+#| "Options:\n"
+#| "  --admindir <directory>     Use <directory> instead of %s.\n"
+#| "  --expert                   Turn on expert mode.\n"
+#| "  --debug <file> | -D<file>  Turn on debugging, sending output to "
+#| "<file>.\n"
+#| "  --colour | --color screenpart:[foreground],[background][:attr[+attr"
+#| "+...]]\n"
+#| "                             Configure screen colours.\n"
+#| "\n"
 msgid ""
 "Options:\n"
-"  --admindir <directory>     Use <directory> instead of %s.\n"
-"  --expert                   Turn on expert mode.\n"
-"  --debug <file> | -D<file>  Turn on debugging, sending output to <file>.\n"
-"  --colour | --color screenpart:[foreground],[background][:attr[+attr+...]]\n"
-"                             Configure screen colours.\n"
-"\n"
+"      --admindir <directory>       Use <directory> instead of %s.\n"
+"      --expert                     Turn on expert mode.\n"
+"  -D, --debug <file>               Turn on debugging, send output to "
+"<file>.\n"
+"      --color <color-spec>         Configure screen colors.\n"
+"      --colour <color-spec>        Ditto.\n"
 msgstr ""
 "Tilvalg:\n"
 "  --admindir <mappe>         Benyt <mappe> i stedet for %s.\n"
@@ -862,72 +880,79 @@ msgstr ""
 "                             Indstil skærmfarver.\n"
 "\n"
 
-#: dselect/main.cc:193
-#, c-format
+#: dselect/main.cc
+#, fuzzy, c-format
+#| msgid ""
+#| "  --help                     Show this help message.\n"
+#| "  --version                  Show the version.\n"
+#| "\n"
 msgid ""
-"  --help                     Show this help message.\n"
-"  --version                  Show the version.\n"
+"  -?, --help                       Show this help message.\n"
+"      --version                    Show the version.\n"
 "\n"
 msgstr ""
 "  --help                     Vis denne hjælpetekst.\n"
 "  --version                  Vis versionsnummer.\n"
 "\n"
 
-#: dselect/main.cc:197
+#: dselect/main.cc
 #, c-format
-msgid "Actions:\n"
-msgstr "Handlinger:\n"
+msgid ""
+"<color-spec> is <screen-part>:[<foreground>],[<background>][:"
+"<attr>[+<attr>]...]\n"
+msgstr ""
 
-#: dselect/main.cc:202
-#, c-format
-msgid "Screenparts:\n"
+#: dselect/main.cc
+#, fuzzy, c-format
+#| msgid "Screenparts:\n"
+msgid "<screen-part> is:"
 msgstr "Skærmområder:\n"
 
-#: dselect/main.cc:207
+#: dselect/main.cc
 #, c-format
-msgid "Colours:\n"
-msgstr "Farver:\n"
+msgid "<color> is:"
+msgstr ""
 
-#: dselect/main.cc:212
+#: dselect/main.cc
 #, c-format
-msgid "Attributes:\n"
-msgstr "Egenskaber:\n"
+msgid "<attr> is:"
+msgstr ""
 
-#: dselect/main.cc:232
+#: dselect/main.cc
 #, c-format
 msgid "couldn't open debug file `%.255s'\n"
 msgstr "kunne ikke åbne aflusningsfil »%.255s«\n"
 
-#: dselect/main.cc:253
+#: dselect/main.cc
 #, c-format
 msgid "invalid %s '%s'"
 msgstr "ugyldig %s »%s«"
 
-#: dselect/main.cc:272
+#: dselect/main.cc
 msgid "screen part"
 msgstr "skærmområde"
 
-#: dselect/main.cc:278
+#: dselect/main.cc
 msgid "null colour specification"
 msgstr "null-farveangivelse"
 
-#: dselect/main.cc:286 dselect/main.cc:291
+#: dselect/main.cc
 msgid "colour"
 msgstr "farve"
 
-#: dselect/main.cc:299
+#: dselect/main.cc
 msgid "colour attribute"
 msgstr "farveegenskab"
 
-#: dselect/main.cc:333
+#: dselect/main.cc
 msgid "Terminal does not appear to support cursor addressing.\n"
 msgstr "Terminalen lader ikke til at understøtte makøradressering.\n"
 
-#: dselect/main.cc:335
+#: dselect/main.cc
 msgid "Terminal does not appear to support highlighting.\n"
 msgstr "Terminalen lader ikke til at understøtte fremhævning.\n"
 
-#: dselect/main.cc:337
+#: dselect/main.cc
 #, c-format
 msgid ""
 "Set your TERM variable correctly, use a better terminal,\n"
@@ -936,11 +961,11 @@ msgstr ""
 "Sæt din TERM-variabel korrekt, brug en bedre terminal\n"
 "eller nøjes med enkeltpakke-håndteringsværktøjet %s.\n"
 
-#: dselect/main.cc:340
+#: dselect/main.cc
 msgid "terminal lacks necessary features, giving up"
 msgstr "teminalen mangler nødvendige funktioner. Giver op"
 
-#: dselect/main.cc:425
+#: dselect/main.cc
 msgid ""
 "\n"
 "\n"
@@ -954,7 +979,7 @@ msgstr ""
 "Tryk <retur> for at bekræfte valg.  ^L gentegner skærmen.\n"
 "\n"
 
-#: dselect/main.cc:430
+#: dselect/main.cc
 msgid ""
 "Copyright (C) 1994-1996 Ian Jackson.\n"
 "Copyright (C) 2000,2001 Wichert Akkerman.\n"
@@ -962,7 +987,7 @@ msgstr ""
 "Copyright (C) 1994-1996 Ian Jackson.\n"
 "Copyright (C) 2000,2001 Wichert Akkerman.\n"
 
-#: dselect/main.cc:436
+#: dselect/main.cc
 msgid ""
 "\n"
 "\n"
@@ -972,57 +997,57 @@ msgstr ""
 "\n"
 "Skrivebeskyttet adgang: kun visning af valg er tilgængelig!"
 
-#: dselect/main.cc:455
+#: dselect/main.cc
 msgid "failed to getch in main menu"
 msgstr "kunne ikke udføre 'getch' i hovedmenu"
 
-#: dselect/main.cc:538
+#: dselect/main.cc
 #, c-format
 msgid "unknown action string `%.50s'"
 msgstr "ukendt handlingsstreng »%.50s«"
 
-#: dselect/methlist.cc:66
+#: dselect/methlist.cc
 msgid "Abbrev."
 msgstr "Forkort."
 
-#: dselect/methlist.cc:67 dselect/pkgdisplay.cc:188 dselect/pkginfo.cc:110
+#: dselect/methlist.cc dselect/pkgdisplay.cc dselect/pkginfo.cc
 msgid "Description"
 msgstr "Beskrivelse"
 
-#: dselect/methlist.cc:73
+#: dselect/methlist.cc
 msgid "dselect - list of access methods"
 msgstr "dselect - liste over tilgangsmetoder"
 
-#: dselect/methlist.cc:82
+#: dselect/methlist.cc
 #, c-format
 msgid "Access method `%s'."
 msgstr "Tilgangsmetode »%s«."
 
-#: dselect/methlist.cc:161 dselect/pkglist.cc:587
+#: dselect/methlist.cc dselect/pkglist.cc
 msgid "doupdate failed"
 msgstr "doupdate mislykkedes"
 
-#: dselect/methlist.cc:164 dselect/pkglist.cc:590
+#: dselect/methlist.cc dselect/pkglist.cc
 msgid "failed to unblock SIGWINCH"
 msgstr "kunne ikke afblokere SIGWINCH"
 
-#: dselect/methlist.cc:169 dselect/pkglist.cc:595
+#: dselect/methlist.cc dselect/pkglist.cc
 msgid "failed to re-block SIGWINCH"
 msgstr "kunne ikke genblokere SIGWINCH"
 
-#: dselect/methlist.cc:170 dselect/pkglist.cc:597
+#: dselect/methlist.cc dselect/pkglist.cc
 msgid "getch failed"
 msgstr "'getch' mislykkedes"
 
-#: dselect/methlist.cc:187
+#: dselect/methlist.cc
 msgid "Explanation"
 msgstr "Forklaring"
 
-#: dselect/methlist.cc:197
+#: dselect/methlist.cc
 msgid "No explanation available."
 msgstr "Ingen tilgængelig forklaring."
 
-#: dselect/method.cc:67
+#: dselect/method.cc
 #, c-format
 msgid ""
 "\n"
@@ -1033,7 +1058,7 @@ msgstr ""
 "\n"
 "%s: %s\n"
 
-#: dselect/method.cc:70
+#: dselect/method.cc
 msgid ""
 "\n"
 "Press <enter> to continue."
@@ -1041,185 +1066,195 @@ msgstr ""
 "\n"
 "Tryk <retur> for at fortsætte."
 
-#: dselect/method.cc:82
+#: dselect/method.cc
 msgid "cannot unlock access method area"
 msgstr "kan ikke låse op for adgangsmetodeområdet"
 
-#: dselect/method.cc:96
+#: dselect/method.cc
 msgid "no access methods are available"
 msgstr "ingen adgangsmetoder er tilgængelige"
 
-#: dselect/method.cc:115
+#: dselect/method.cc
 msgid "requested operation requires superuser privilege"
 msgstr "anmodte operation kræver superbruger-privilegie"
 
-#: dselect/method.cc:118
+#: dselect/method.cc
 msgid "cannot open or create access method lockfile"
 msgstr "kan ikke åben eller oprette adgangsmetode-låsfil"
 
-#: dselect/method.cc:125
+#: dselect/method.cc
 msgid "the access method area is already locked"
 msgstr "adgangsmetodeområdet er allerede låst"
 
-#: dselect/method.cc:128
+#: dselect/method.cc
 msgid "cannot lock access method area"
 msgstr "kan ikke låse adgangsmetodeområde"
 
-#: dselect/method.cc:161
+#: dselect/method.cc
 #, c-format
 msgid "Press <enter> to continue.\n"
 msgstr "Tryk <retur> for at fortsætte.\n"
 
-#: dselect/method.cc:162
+#: dselect/method.cc
 msgid "<standard error>"
 msgstr "<standardfejl>"
 
-#: dselect/method.cc:165
+#: dselect/method.cc
 msgid "error reading acknowledgement of program failure message"
 msgstr "fejl inder læsning af godkendelse af programfejlmeddelelse"
 
-#: dselect/method.cc:187
+#: dselect/method.cc
 msgid "no access method is selected or configured"
 msgstr "ingen adgangsmetode er valgt eller konfigureret"
 
-#: dselect/method.cc:196
+#: dselect/method.cc
 msgid "update available list script"
 msgstr "script til opdatering af tilgængelighedsliste"
 
-#: dselect/method.cc:200
+#: dselect/method.cc
 msgid "installation script"
 msgstr "installationsscript"
 
-#: dselect/method.cc:246
+#: dselect/method.cc
 msgid "query/setup script"
 msgstr "script til forespørgsel/opsætning"
 
-#: dselect/methparse.cc:53
+#: dselect/methparse.cc
 #, c-format
 msgid "syntax error in method options file `%.250s' -- %s"
 msgstr "syntaksfejl i metode-tilvalgsfil »%.250s« -- %s"
 
-#: dselect/methparse.cc:59
+#: dselect/methparse.cc
 #, c-format
 msgid "error reading options file `%.250s'"
 msgstr "fejl under læsning af tilvalgsfil »%.250s«"
 
-#: dselect/methparse.cc:93
+#: dselect/methparse.cc
 #, c-format
 msgid "unable to read `%.250s' directory for reading methods"
 msgstr "kunne ikke læse »%.250s«-mappe for læsning af metoder"
 
-#: dselect/methparse.cc:109
+#: dselect/methparse.cc
 #, c-format
 msgid "method `%.250s' has name that is too long (%d > %d characters)"
 msgstr "metoden »%.250s« har et for langt navn (%d > %d tegn)"
 
-#: dselect/methparse.cc:120
+#: dselect/methparse.cc
 #, c-format
 msgid "unable to access method script `%.250s'"
 msgstr "kunne ikke tilgå metodescriptet »%.250s«"
 
-#: dselect/methparse.cc:126
+#: dselect/methparse.cc
 #, c-format
 msgid "unable to read method options file `%.250s'"
 msgstr "kunne ikke læse metodetilvalgsfil »%.250s«"
 
-#: dselect/methparse.cc:150
+#: dselect/methparse.cc
 msgid "non-digit where digit wanted"
 msgstr "ikke-tal, hvor et tal var ønsket"
 
-#: dselect/methparse.cc:153
-msgid "EOF in index string"
+#: dselect/methparse.cc
+#, fuzzy
+#| msgid "EOF in index string"
+msgid "end of file in index string"
 msgstr "slut-på-fil i indeksstreng"
 
-#: dselect/methparse.cc:156
+#: dselect/methparse.cc
 msgid "index string too long"
 msgstr "indeksstreng er for lang"
 
-#: dselect/methparse.cc:159
+#: dselect/methparse.cc
 msgid "newline before option name start"
 msgstr "linjeskift før starten på tilvalgsnavn"
 
-#: dselect/methparse.cc:161
-msgid "EOF before option name start"
-msgstr "slut-på-fil inden starten af tilvalgsnavn"
+#: dselect/methparse.cc
+#, fuzzy
+#| msgid "newline before option name start"
+msgid "end of file before option name start"
+msgstr "linjeskift før starten på tilvalgsnavn"
 
-#: dselect/methparse.cc:165
+#: dselect/methparse.cc
 msgid "nonalpha where option name start wanted"
 msgstr "ikke-bogstav, hvor tilvalgsnavn var ønsket"
 
-#: dselect/methparse.cc:167
+#: dselect/methparse.cc
 msgid "non-alphanum in option name"
 msgstr "tegn i navn, der ikke er et bogstav eller tal"
 
-#: dselect/methparse.cc:170
-msgid "EOF in option name"
+#: dselect/methparse.cc
+#, fuzzy
+#| msgid "EOF in option name"
+msgid "end of file in option name"
 msgstr "slut-på-fil i tilvalgsnavn"
 
-#: dselect/methparse.cc:175
+#: dselect/methparse.cc
 msgid "newline before summary"
 msgstr "linjeskift inden beskrivelsen"
 
-#: dselect/methparse.cc:177
-msgid "EOF before summary"
-msgstr "slut-på-fil inden beskrivelsen"
+#: dselect/methparse.cc
+#, fuzzy
+#| msgid "newline before summary"
+msgid "end of file before summary"
+msgstr "linjeskift inden beskrivelsen"
 
-#: dselect/methparse.cc:183
-msgid "EOF in summary - missing newline"
+#: dselect/methparse.cc
+#, fuzzy
+#| msgid "EOF in summary - missing newline"
+msgid "end of file in summary - missing newline"
 msgstr "slut-på-fil i beskrivelsen - manglende linjeskift"
 
-#: dselect/methparse.cc:193
+#: dselect/methparse.cc
 #, c-format
 msgid "unable to open option description file `%.250s'"
 msgstr "kunne ikke åbne tilvalgsbeskrivelsesfilen »%.250s«"
 
-#: dselect/methparse.cc:197
+#: dselect/methparse.cc
 #, c-format
 msgid "unable to stat option description file `%.250s'"
 msgstr "kunne ikke finde tilvalgsbeskrivelsesfilen »%.250s«"
 
-#: dselect/methparse.cc:201
+#: dselect/methparse.cc
 #, c-format
 msgid "failed to read option description file `%.250s'"
 msgstr "kunne ikke læse tilvalgsbeskrivelsesfilen »%.250s«"
 
-#: dselect/methparse.cc:204
+#: dselect/methparse.cc
 #, c-format
 msgid "error during read of option description file `%.250s'"
 msgstr "fejl ved læsning af tilvalgsbeskrivelsesfilen »%.250s«"
 
-#: dselect/methparse.cc:227
+#: dselect/methparse.cc
 #, c-format
 msgid "error during read of method options file `%.250s'"
 msgstr "fejl ved læsning af metodetilvalgsfilen »%.250s«"
 
-#: dselect/methparse.cc:250
+#: dselect/methparse.cc
 #, c-format
 msgid "unable to open current option file `%.250s'"
 msgstr "kunne ikke åbne aktuel tilvalgsfil »%.250s«"
 
-#: dselect/methparse.cc:286
+#: dselect/methparse.cc
 #, c-format
 msgid "unable to write new option to `%.250s'"
 msgstr "kunne ikke skrive ny tilvalgsfil »%.250s«"
 
-#: dselect/pkgdisplay.cc:36
+#: dselect/pkgdisplay.cc
 msgid "new package"
 msgstr "ny pakke"
 
-#: dselect/pkgdisplay.cc:37
+#: dselect/pkgdisplay.cc
 msgid "install"
 msgstr "installer"
 
-#: dselect/pkgdisplay.cc:38
+#: dselect/pkgdisplay.cc
 msgid "hold"
 msgstr "hold tilbage"
 
-#: dselect/pkgdisplay.cc:39
+#: dselect/pkgdisplay.cc
 msgid "remove"
 msgstr "afinstaller"
 
-#: dselect/pkgdisplay.cc:40
+#: dselect/pkgdisplay.cc
 msgid "purge"
 msgstr "udrens"
 
@@ -1227,328 +1262,322 @@ msgstr "udrens"
 #. * the empty string to store information about the translation. DO NOT
 #. * CHANGE THAT IN A TRANSLATION! The code really relies on that being
 #. * a single space.
-#: dselect/pkgdisplay.cc:47
+#: dselect/pkgdisplay.cc
 msgid " "
 msgstr " "
 
-#: dselect/pkgdisplay.cc:48
+#: dselect/pkgdisplay.cc
 msgid "REINSTALL"
 msgstr "GENINSTALLER"
 
-#: dselect/pkgdisplay.cc:51
+#: dselect/pkgdisplay.cc
 msgid "not installed"
 msgstr "ikke installeret"
 
-#: dselect/pkgdisplay.cc:52
+#: dselect/pkgdisplay.cc
 msgid "removed (configs remain)"
 msgstr "afinstalleret (opsætning bevaret)"
 
-#: dselect/pkgdisplay.cc:53
+#: dselect/pkgdisplay.cc
 msgid "half installed"
 msgstr "halvt installeret"
 
-#: dselect/pkgdisplay.cc:54
+#: dselect/pkgdisplay.cc
 msgid "unpacked (not set up)"
 msgstr "udpakket (ikke sat op)"
 
-#: dselect/pkgdisplay.cc:55
+#: dselect/pkgdisplay.cc
 msgid "half configured (config failed)"
 msgstr "halvt konfigureret (konfiguration mislykkedes)"
 
-#: dselect/pkgdisplay.cc:56
+#: dselect/pkgdisplay.cc
 msgid "awaiting trigger processing"
 msgstr "venter på udløserbehandling"
 
-#: dselect/pkgdisplay.cc:57
+#: dselect/pkgdisplay.cc
 msgid "triggered"
 msgstr "udløst"
 
-#: dselect/pkgdisplay.cc:58
+#: dselect/pkgdisplay.cc
 msgid "installed"
 msgstr "installeret"
 
-#: dselect/pkgdisplay.cc:61
+#: dselect/pkgdisplay.cc
 msgid "Required"
 msgstr "krævede"
 
-#: dselect/pkgdisplay.cc:62
+#: dselect/pkgdisplay.cc
 msgid "Important"
 msgstr "vigtige"
 
-#: dselect/pkgdisplay.cc:63
+#: dselect/pkgdisplay.cc
 msgid "Standard"
 msgstr "standard"
 
-#: dselect/pkgdisplay.cc:64
+#: dselect/pkgdisplay.cc
 msgid "Optional"
 msgstr "valgfrie"
 
-#: dselect/pkgdisplay.cc:65
+#: dselect/pkgdisplay.cc
 msgid "Extra"
 msgstr "ekstra"
 
-#: dselect/pkgdisplay.cc:66
-msgid "!Bug!"
-msgstr "!Lus!"
-
-#: dselect/pkgdisplay.cc:67
+#: dselect/pkgdisplay.cc
 msgid "Unclassified"
 msgstr "uklassificerede"
 
-#: dselect/pkgdisplay.cc:70
+#: dselect/pkgdisplay.cc
 msgid "suggests"
 msgstr "foreslår"
 
-#: dselect/pkgdisplay.cc:71
+#: dselect/pkgdisplay.cc
 msgid "recommends"
 msgstr "anbefaler"
 
-#: dselect/pkgdisplay.cc:72
+#: dselect/pkgdisplay.cc
 msgid "depends on"
 msgstr "afhænger af"
 
-#: dselect/pkgdisplay.cc:73
+#: dselect/pkgdisplay.cc
 msgid "pre-depends on"
 msgstr "forhånds-afhænger af"
 
 # ('breaks' nogle andre pakker, typisk)
-#: dselect/pkgdisplay.cc:74
+#: dselect/pkgdisplay.cc
 msgid "breaks"
 msgstr "ødelægger"
 
-#: dselect/pkgdisplay.cc:75
+#: dselect/pkgdisplay.cc
 msgid "conflicts with"
 msgstr "er i konflikt med"
 
-#: dselect/pkgdisplay.cc:76
+#: dselect/pkgdisplay.cc
 msgid "provides"
 msgstr "giver"
 
-#: dselect/pkgdisplay.cc:77
+#: dselect/pkgdisplay.cc
 msgid "replaces"
 msgstr "erstatter"
 
-#: dselect/pkgdisplay.cc:78
+#: dselect/pkgdisplay.cc
 msgid "enhances"
 msgstr "forbedrer"
 
-#: dselect/pkgdisplay.cc:81
+#: dselect/pkgdisplay.cc
 msgid "Req"
 msgstr "Krv"
 
-#: dselect/pkgdisplay.cc:82
+#: dselect/pkgdisplay.cc
 msgid "Imp"
 msgstr "Vgt"
 
-#: dselect/pkgdisplay.cc:83
+#: dselect/pkgdisplay.cc
 msgid "Std"
 msgstr "Std"
 
-#: dselect/pkgdisplay.cc:84
+#: dselect/pkgdisplay.cc
 msgid "Opt"
 msgstr "Fri"
 
-#: dselect/pkgdisplay.cc:85
+#: dselect/pkgdisplay.cc
 msgid "Xtr"
 msgstr "Eks"
 
-#: dselect/pkgdisplay.cc:86
+#: dselect/pkgdisplay.cc
 msgid "bUG"
 msgstr "LUS"
 
-#: dselect/pkgdisplay.cc:87
+#: dselect/pkgdisplay.cc
 msgid "?"
 msgstr "?"
 
-#: dselect/pkgdisplay.cc:95 dselect/pkgdisplay.cc:115
+#: dselect/pkgdisplay.cc
 msgid "Broken"
 msgstr "Ødelagte"
 
-#: dselect/pkgdisplay.cc:96
+#: dselect/pkgdisplay.cc
 msgid "New"
 msgstr "Nye"
 
-#: dselect/pkgdisplay.cc:97
-msgid "Updated"
-msgstr "Opdaterede"
+#: dselect/pkgdisplay.cc
+msgid "Upgradable"
+msgstr ""
 
-#: dselect/pkgdisplay.cc:98
+#: dselect/pkgdisplay.cc
 msgid "Obsolete/local"
 msgstr "Forældede/lokale"
 
-#: dselect/pkgdisplay.cc:99
-msgid "Up-to-date"
-msgstr "Helt opdaterede"
+#: dselect/pkgdisplay.cc
+msgid "Installed"
+msgstr "Installerede"
 
-#: dselect/pkgdisplay.cc:100
+#: dselect/pkgdisplay.cc
 msgid "Available"
 msgstr "Tilgængelige"
 
-#: dselect/pkgdisplay.cc:101 dselect/pkgdisplay.cc:117
+#: dselect/pkgdisplay.cc
 msgid "Removed"
 msgstr "Afinstallerede"
 
-#: dselect/pkgdisplay.cc:102 dselect/pkgdisplay.cc:111
+#: dselect/pkgdisplay.cc
 msgid "Brokenly installed packages"
 msgstr "Ødelagte installerede pakker"
 
-#: dselect/pkgdisplay.cc:103
+#: dselect/pkgdisplay.cc
 msgid "Newly available packages"
 msgstr "Nyligt tilgængelige pakker"
 
-#: dselect/pkgdisplay.cc:104
-msgid "Updated packages (newer version is available)"
-msgstr "Opdaterede pakker (nyere version tilgængelig)"
+#: dselect/pkgdisplay.cc
+#, fuzzy
+#| msgid "Newly available packages"
+msgid "Upgradable packages"
+msgstr "Nyligt tilgængelige pakker"
 
-#: dselect/pkgdisplay.cc:105
-msgid "Obsolete and local packages present on system"
+#: dselect/pkgdisplay.cc
+#, fuzzy
+#| msgid "Obsolete and local packages present on system"
+msgid "Obsolete and locally created packages"
 msgstr "Forældede og lokale pakker på systemet"
 
-#: dselect/pkgdisplay.cc:106
-msgid "Up to date installed packages"
-msgstr "Installerede pakker i nyeste version"
+#: dselect/pkgdisplay.cc
+msgid "Installed packages"
+msgstr "Installerede pakker"
 
-#: dselect/pkgdisplay.cc:107
-msgid "Available packages (not currently installed)"
-msgstr "Tilgængelige pakker (ikke installerede)"
+#: dselect/pkgdisplay.cc
+#, fuzzy
+#| msgid "Up to date installed packages"
+msgid "Available not installed packages"
+msgstr "Installerede pakker i nyeste version"
 
-#: dselect/pkgdisplay.cc:108
+#: dselect/pkgdisplay.cc
 msgid "Removed and no longer available packages"
 msgstr "Afinstallerede og ikke længere tilgængelige pakker"
 
-#: dselect/pkgdisplay.cc:112
-msgid "Installed packages"
-msgstr "Installerede pakker"
-
-#: dselect/pkgdisplay.cc:113
+#: dselect/pkgdisplay.cc
 msgid "Removed packages (configuration still present)"
 msgstr "Afinstallerede pakker (opsætning bevaret)"
 
-#: dselect/pkgdisplay.cc:114
+#: dselect/pkgdisplay.cc
 msgid "Purged packages and those never installed"
 msgstr "Udrensede og aldrig installerede pakker"
 
-#: dselect/pkgdisplay.cc:116
-msgid "Installed"
-msgstr "Installerede"
-
-#: dselect/pkgdisplay.cc:118
+#: dselect/pkgdisplay.cc
 msgid "Purged"
 msgstr "Udrensede"
 
-#: dselect/pkgdisplay.cc:138
+#: dselect/pkgdisplay.cc
 msgid "Error"
 msgstr "Fejl"
 
-#: dselect/pkgdisplay.cc:139
+#: dselect/pkgdisplay.cc
 msgid "Installed?"
 msgstr "Installeret?"
 
-#: dselect/pkgdisplay.cc:140
+#: dselect/pkgdisplay.cc
 msgid "Old mark"
 msgstr "Gammelt mærke"
 
-#: dselect/pkgdisplay.cc:141
+#: dselect/pkgdisplay.cc
 msgid "Marked for"
 msgstr "Markeret for"
 
-#: dselect/pkgdisplay.cc:143
+#: dselect/pkgdisplay.cc
 msgid "EIOM"
 msgstr "FIGM"
 
-#: dselect/pkgdisplay.cc:147 dselect/pkgdisplay.cc:150
+#: dselect/pkgdisplay.cc
 msgid "Section"
 msgstr "Gruppe"
 
-#: dselect/pkgdisplay.cc:148
+#: dselect/pkgdisplay.cc
 msgid "Priority"
 msgstr "Prioritet"
 
-#: dselect/pkgdisplay.cc:152
+#: dselect/pkgdisplay.cc
 msgid "Package"
 msgstr "Pakke"
 
-#: dselect/pkgdisplay.cc:161 dselect/pkgdisplay.cc:165
+#: dselect/pkgdisplay.cc
 msgid "Avail.arch"
 msgstr "Tilg.ark"
 
-#: dselect/pkgdisplay.cc:164
+#: dselect/pkgdisplay.cc
 msgid "Inst.arch"
 msgstr "Inst.ark"
 
-#: dselect/pkgdisplay.cc:178 dselect/pkgdisplay.cc:182
+#: dselect/pkgdisplay.cc
 msgid "Avail.ver"
 msgstr "Tilg.ver"
 
-#: dselect/pkgdisplay.cc:181
+#: dselect/pkgdisplay.cc
 msgid "Inst.ver"
 msgstr "Inst.ver"
 
-#: dselect/pkgdisplay.cc:197
+#: dselect/pkgdisplay.cc
 msgid "dselect - recursive package listing"
 msgstr "dselect - rekursiv pakkevisning"
 
-#: dselect/pkgdisplay.cc:199
+#: dselect/pkgdisplay.cc
 msgid "dselect - inspection of package states"
 msgstr "dselect - inspektion af pakkestatus"
 
-#: dselect/pkgdisplay.cc:200
+#: dselect/pkgdisplay.cc
 msgid "dselect - main package listing"
 msgstr "dselect - hoved-pakkevisning"
 
-#: dselect/pkgdisplay.cc:208
+#: dselect/pkgdisplay.cc
 msgid " (by section)"
 msgstr " (efter gruppe)"
 
-#: dselect/pkgdisplay.cc:211
+#: dselect/pkgdisplay.cc
 msgid " (avail., section)"
 msgstr " (tilg., gruppe)"
 
-#: dselect/pkgdisplay.cc:214
+#: dselect/pkgdisplay.cc
 msgid " (status, section)"
 msgstr " (status, gruppe)"
 
-#: dselect/pkgdisplay.cc:223
+#: dselect/pkgdisplay.cc
 msgid " (by priority)"
 msgstr " (efter prioritet)"
 
-#: dselect/pkgdisplay.cc:226
+#: dselect/pkgdisplay.cc
 msgid " (avail., priority)"
 msgstr " (tilg., prioritet)"
 
-#: dselect/pkgdisplay.cc:229
+#: dselect/pkgdisplay.cc
 msgid " (status, priority)"
 msgstr " (status, prioritet)"
 
-#: dselect/pkgdisplay.cc:238
+#: dselect/pkgdisplay.cc
 msgid " (alphabetically)"
 msgstr " (alfabetisk)"
 
-#: dselect/pkgdisplay.cc:241
+#: dselect/pkgdisplay.cc
 msgid " (by availability)"
 msgstr " (efter tilgæng.)"
 
-#: dselect/pkgdisplay.cc:244
+#: dselect/pkgdisplay.cc
 msgid " (by status)"
 msgstr " (efter status)"
 
-#: dselect/pkgdisplay.cc:259
+#: dselect/pkgdisplay.cc
 msgid " mark:+/=/- terse:v help:?"
 msgstr " marker:+/=/- koncis:v hjælp:?"
 
-#: dselect/pkgdisplay.cc:260
+#: dselect/pkgdisplay.cc
 msgid " mark:+/=/- verbose:v help:?"
 msgstr " marker:+/=/- detalj:v hjælp:?"
 
-#: dselect/pkgdisplay.cc:262
+#: dselect/pkgdisplay.cc
 msgid " terse:v help:?"
 msgstr " koncis:v hjælp:?"
 
-#: dselect/pkgdisplay.cc:263
+#: dselect/pkgdisplay.cc
 msgid " verbose:v help:?"
 msgstr " detaljer:v hjælp:?"
 
-#: dselect/pkginfo.cc:85
+#: dselect/pkginfo.cc
 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 "
@@ -1568,76 +1597,106 @@ msgstr ""
 "Du kan bruge 'o' eller'O' til at ændre sorteringsrækkefølgen og give dit "
 "selv mulighed for at markere pakkerne i andre grupper."
 
-#: dselect/pkginfo.cc:98
+#: dselect/pkginfo.cc
 msgid "Interrelationships"
 msgstr "Sammenhænge"
 
-#: dselect/pkginfo.cc:117
+#: dselect/pkginfo.cc
 msgid "No description available."
 msgstr "Ingen tilgængelig beskrivelse."
 
-#: dselect/pkginfo.cc:135
+#: dselect/pkginfo.cc
 msgid "Installed control file information"
 msgstr "Installeret kontrolfilinformation"
 
-#: dselect/pkginfo.cc:151
+#: dselect/pkginfo.cc
 msgid "Available control file information"
 msgstr "Tilgængelig kontrolfilinformation"
 
-#: dselect/pkglist.cc:425
+#: dselect/pkglist.cc
 msgid "there are no packages"
 msgstr "der er ingen pakker"
 
-#: dselect/pkglist.cc:521
+#: dselect/pkglist.cc
 msgid "invalid search option given"
 msgstr "ugyldigt søgetilvalg angivet"
 
-#: dselect/pkglist.cc:536
+#: dselect/pkglist.cc
 msgid "error in regular expression"
 msgstr "fejl i regulært udtryk"
 
-#: dselect/pkgsublist.cc:111
+#: dselect/pkgsublist.cc
 msgid " does not appear to be available\n"
 msgstr " lader ikke til at være tilgængelig\n"
 
-#: dselect/pkgsublist.cc:131
+#: dselect/pkgsublist.cc
 msgid " or "
 msgstr " eller "
 
-#: dselect/pkgtop.cc:58
+#: dselect/pkgtop.cc
 msgid "All"
 msgstr "Alle"
 
-#: dselect/pkgtop.cc:80
+#: dselect/pkgtop.cc
 msgid "All packages"
 msgstr "Alle pakker"
 
-#: dselect/pkgtop.cc:84
+#: dselect/pkgtop.cc
 #, c-format
 msgid "%s packages without a section"
 msgstr "%s pakker udenfor gruppe"
 
-#: dselect/pkgtop.cc:86
+#: dselect/pkgtop.cc
 #, c-format
 msgid "%s packages in section %s"
 msgstr "%s pakker i %s-gruppen"
 
-#: dselect/pkgtop.cc:92
+#: dselect/pkgtop.cc
 #, c-format
 msgid "%s %s packages"
 msgstr "%s %s pakker"
 
-#: dselect/pkgtop.cc:96
+#: dselect/pkgtop.cc
 #, c-format
 msgid "%s %s packages without a section"
 msgstr "%s %s pakker udenfor gruppe"
 
-#: dselect/pkgtop.cc:98
+#: dselect/pkgtop.cc
 #, c-format
 msgid "%s %s packages in section %s"
 msgstr "%s %s pakker i %s-gruppen"
 
-#: dselect/pkgtop.cc:119
+#: dselect/pkgtop.cc
 #, c-format
 msgid "%-*s %s%s%s;  %s (was: %s).  %s"
 msgstr "%-*s %s%s%s;  %s (var: %s).  %s"
+
+#~ msgid "Actions:\n"
+#~ msgstr "Handlinger:\n"
+
+#~ msgid "Colours:\n"
+#~ msgstr "Farver:\n"
+
+#~ msgid "Attributes:\n"
+#~ msgstr "Egenskaber:\n"
+
+#~ msgid "EOF before option name start"
+#~ msgstr "slut-på-fil inden starten af tilvalgsnavn"
+
+#~ msgid "EOF before summary"
+#~ msgstr "slut-på-fil inden beskrivelsen"
+
+#~ msgid "!Bug!"
+#~ msgstr "!Lus!"
+
+#~ msgid "Updated"
+#~ msgstr "Opdaterede"
+
+#~ msgid "Up-to-date"
+#~ msgstr "Helt opdaterede"
+
+#~ msgid "Updated packages (newer version is available)"
+#~ msgstr "Opdaterede pakker (nyere version tilgængelig)"
+
+#~ msgid "Available packages (not currently installed)"
+#~ msgstr "Tilgængelige pakker (ikke installerede)"
diff --git a/dselect/po/de.po b/dselect/po/de.po
index 4564e7580..3b7450bcb 100644
--- a/dselect/po/de.po
+++ b/dselect/po/de.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dselect 1.17.17\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2014-12-23 18:12+0100\n"
+"POT-Creation-Date: 2015-04-06 09:37+0200\n"
 "PO-Revision-Date: 2014-10-12 08:47+0200\n"
 "Last-Translator: Sven Joachim <svenjoac@gmx.de>\n"
 "Language-Team: German <debian-l10n-german@lists.debian.org>\n"
@@ -19,28 +19,28 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: dselect/basecmds.cc:125
+#: dselect/basecmds.cc
 msgid "Search for ? "
 msgstr "Suchen nach ? "
 
-#: dselect/basecmds.cc:149
+#: dselect/basecmds.cc
 msgid "Error: "
 msgstr "Fehler: "
 
-#: dselect/basecmds.cc:180
+#: dselect/basecmds.cc
 msgid "Help: "
 msgstr "Hilfe: "
 
-#: dselect/basecmds.cc:186
+#: dselect/basecmds.cc
 msgid "Press ? for help menu, . for next topic, <space> to exit help."
 msgstr ""
 "»?« für Hilfemenü, ».« für nächstes Thema, <Leer> zum Verlassen der Hilfe."
 
-#: dselect/basecmds.cc:193
+#: dselect/basecmds.cc
 msgid "Help information is available under the following topics:"
 msgstr "Hilfeinformationen sind unter den folgenden Themen verfügbar:"
 
-#: dselect/basecmds.cc:201
+#: dselect/basecmds.cc
 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. "
@@ -48,244 +48,244 @@ msgstr ""
 "Drücken Sie eine Taste aus der obigen Liste, <Leer> oder »q«, um die\n"
 "  Hilfe zu beenden, oder ».«, um alle Hilfeseiten nacheinander zu lesen. "
 
-#: dselect/basecmds.cc:207
+#: dselect/basecmds.cc
 msgid "error reading keyboard in help"
 msgstr "Fehler beim Lesen der Tastatur in der Hilfe"
 
-#: dselect/baselist.cc:60
+#: dselect/baselist.cc
 msgid "ioctl(TIOCGWINSZ) failed"
 msgstr "ioctl(TIOCGWINSZ) fehlgeschlagen"
 
-#: dselect/baselist.cc:63
+#: dselect/baselist.cc
 msgid "doupdate in SIGWINCH handler failed"
 msgstr "doupdate im SIGWINCH-Handler fehlgeschlagen"
 
-#: dselect/baselist.cc:72
+#: dselect/baselist.cc
 msgid "failed to restore old SIGWINCH sigact"
 msgstr "Alter SIGWINCH-sigact konnte nicht wiederhergestellt werden"
 
-#: dselect/baselist.cc:75
+#: dselect/baselist.cc
 msgid "failed to restore old signal mask"
 msgstr "Alte Signalmaske konnte nicht wiederhergestellt werden"
 
-#: dselect/baselist.cc:86
+#: dselect/baselist.cc
 msgid "failed to get old signal mask"
 msgstr "Erhalten der alten Signalmaske fehlgeschlagen"
 
-#: dselect/baselist.cc:88
+#: dselect/baselist.cc
 msgid "failed to get old SIGWINCH sigact"
 msgstr "Erhalten des alten SIGWINCH-sigact fehlgeschlagen"
 
-#: dselect/baselist.cc:93
+#: dselect/baselist.cc
 msgid "failed to block SIGWINCH"
 msgstr "SIGWINCH konnte nicht blockiert werden"
 
-#: dselect/baselist.cc:99
+#: dselect/baselist.cc
 msgid "failed to set new SIGWINCH sigact"
 msgstr "Neuer SIGWINCH-sigact konnte nicht gesetzt werden"
 
-#: dselect/baselist.cc:174
+#: dselect/baselist.cc
 msgid "failed to allocate colour pair"
 msgstr "Farbpaar konnte nicht zugewiesen werden"
 
-#: dselect/baselist.cc:203
+#: dselect/baselist.cc
 msgid "failed to create title window"
 msgstr "Titelfenster konnte nicht erzeugt werden"
 
-#: dselect/baselist.cc:207
+#: dselect/baselist.cc
 msgid "failed to create whatinfo window"
 msgstr "whatinfo-Fenster konnte nicht erzeugt werden"
 
-#: dselect/baselist.cc:211
+#: dselect/baselist.cc
 msgid "failed to create baselist pad"
 msgstr "»baselist pad« konnte nicht erzeugt werden"
 
-#: dselect/baselist.cc:214
+#: dselect/baselist.cc
 msgid "failed to create heading pad"
 msgstr "»heading pad« konnte nicht erzeugt werden"
 
-#: dselect/baselist.cc:218
+#: dselect/baselist.cc
 msgid "failed to create thisstate pad"
 msgstr "»thisstate pad« konnte nicht erzeugt werden"
 
-#: dselect/baselist.cc:222
+#: dselect/baselist.cc
 msgid "failed to create info pad"
 msgstr "»info pad« konnte nicht erzeugt werden"
 
-#: dselect/baselist.cc:227
+#: dselect/baselist.cc
 msgid "failed to create query window"
 msgstr "Abfrage-Fenster konnte nicht erzeugt werden"
 
-#: dselect/baselist.cc:298
+#: dselect/baselist.cc
 msgid "Keybindings"
 msgstr "Tastenzuordnungen"
 
-#: dselect/baselist.cc:347
+#: dselect/baselist.cc
 #, c-format
 msgid "  -- %d%%, press "
 msgstr "  -- %d%%, drücken Sie "
 
-#: dselect/baselist.cc:350
+#: dselect/baselist.cc
 #, c-format
 msgid "%s for more"
 msgstr "%s für mehr"
 
-#: dselect/baselist.cc:354
+#: dselect/baselist.cc
 #, c-format
 msgid "%s to go back"
 msgstr "%s, um zurückzugehen"
 
-#: dselect/bindings.cc:78
+#: dselect/bindings.cc
 msgid "[not bound]"
 msgstr "[nicht zugeordnet]"
 
-#: dselect/bindings.cc:82
+#: dselect/bindings.cc
 #, c-format
 msgid "[unk: %d]"
 msgstr "[unbek: %d]"
 
 # CHECKME: Wo kann man sich die Tastenbelegungen anzeigen lassen?
-#: dselect/bindings.cc:141
+#: dselect/bindings.cc
 msgid "Scroll onwards through help/information"
 msgstr "Vorwärts durch die Hilfe/Informationen scrollen"
 
-#: dselect/bindings.cc:142
+#: dselect/bindings.cc
 msgid "Scroll backwards through help/information"
 msgstr "Rückwärts durch die Hilfe/Informationen scrollen"
 
-#: dselect/bindings.cc:143
+#: dselect/bindings.cc
 msgid "Move up"
 msgstr "Nach oben"
 
-#: dselect/bindings.cc:144
+#: dselect/bindings.cc
 msgid "Move down"
 msgstr "Nach unten"
 
-#: dselect/bindings.cc:145
+#: dselect/bindings.cc
 msgid "Go to top of list"
 msgstr "Zum Listenanfang"
 
-#: dselect/bindings.cc:146
+#: dselect/bindings.cc
 msgid "Go to end of list"
 msgstr "Zum Listenende"
 
-#: dselect/bindings.cc:147
+#: dselect/bindings.cc
 msgid "Request help (cycle through help screens)"
 msgstr "Hilfe abrufen (zyklisch durch die Hilfeseiten blättern)"
 
-#: dselect/bindings.cc:148
+#: dselect/bindings.cc
 msgid "Cycle through information displays"
 msgstr "Zyklisch durch die Informationsanzeigen blättern"
 
-#: dselect/bindings.cc:149
+#: dselect/bindings.cc
 msgid "Redraw display"
 msgstr "Anzeige neu zeichnen"
 
-#: dselect/bindings.cc:150
+#: dselect/bindings.cc
 msgid "Scroll onwards through list by 1 line"
 msgstr "Liste um 1 Zeile vorwärts scrollen"
 
-#: dselect/bindings.cc:151
+#: dselect/bindings.cc
 msgid "Scroll backwards through list by 1 line"
 msgstr "Liste um 1 Zeile rückwärts scrollen"
 
-#: dselect/bindings.cc:152
+#: dselect/bindings.cc
 msgid "Scroll onwards through help/information by 1 line"
 msgstr "Hilfe/Informationen um 1 Zeile vorwärts scrollen"
 
-#: dselect/bindings.cc:153
+#: dselect/bindings.cc
 msgid "Scroll backwards through help/information by 1 line"
 msgstr "Hilfe/Informationen um 1 Zeile rückwärts scrollen"
 
-#: dselect/bindings.cc:154
+#: dselect/bindings.cc
 msgid "Scroll onwards through list"
 msgstr "Liste vorwärts scrollen"
 
-#: dselect/bindings.cc:155
+#: dselect/bindings.cc
 msgid "Scroll backwards through list"
 msgstr "Liste rückwärts scrollen"
 
-#: dselect/bindings.cc:158
+#: dselect/bindings.cc
 msgid "Mark package(s) for installation"
 msgstr "Paket(e) zur Installation markieren"
 
-#: dselect/bindings.cc:159
+#: dselect/bindings.cc
 msgid "Mark package(s) for deinstallation"
 msgstr "Paket(e) zum Entfernen markieren"
 
-#: dselect/bindings.cc:160
+#: dselect/bindings.cc
 msgid "Mark package(s) for deinstall and purge"
 msgstr "Paket(e) zum Entfernen und vollständigen Löschen markieren"
 
 # CHECKME: Was ist damit gemeint?
-#: dselect/bindings.cc:161
+#: dselect/bindings.cc
 msgid "Make highlight more specific"
 msgstr "Hervorhebung genauer machen"
 
 # CHECKME: Was ist damit gemeint?
-#: dselect/bindings.cc:162
+#: dselect/bindings.cc
 msgid "Make highlight less specific"
 msgstr "Hervorhebung weniger genau machen"
 
-#: dselect/bindings.cc:163
+#: dselect/bindings.cc
 msgid "Search for a package whose name contains a string"
 msgstr "Paket suchen, dessen Namen eine Zeichenfolge enthält"
 
-#: dselect/bindings.cc:164
+#: dselect/bindings.cc
 msgid "Repeat last search"
 msgstr "Letzte Suche wiederholen"
 
 # »section« im Sinne von Devel/Games/Hamradio etc. übersetze
 # ich überall mit »Bereich«, wie in aptitude
-#: dselect/bindings.cc:165
+#: dselect/bindings.cc
 msgid "Swap sort order priority/section"
 msgstr "Sortierreihenfolge Priorität/Bereich vertauschen"
 
-#: dselect/bindings.cc:166
+#: dselect/bindings.cc
 msgid "Quit, confirming, and checking dependencies"
 msgstr "Beenden, bestätigen und Abhängigkeiten prüfen"
 
-#: dselect/bindings.cc:167
+#: dselect/bindings.cc
 msgid "Quit, confirming without check"
 msgstr "Beenden, bestätigen, aber nicht prüfen"
 
-#: dselect/bindings.cc:168
+#: dselect/bindings.cc
 msgid "Quit, rejecting conflict/dependency suggestions"
 msgstr "Beenden, Konflikt-/Abhängigkeitsempfehlungen ablehnen"
 
-#: dselect/bindings.cc:169
+#: dselect/bindings.cc
 msgid "Abort - quit without making changes"
 msgstr "Abbrechen - beenden, ohne Änderungen vorzunehmen"
 
-#: dselect/bindings.cc:170
+#: dselect/bindings.cc
 msgid "Revert to old state for all packages"
 msgstr "Zum alten Status aller Pakete zurückkehren"
 
-#: dselect/bindings.cc:171
+#: dselect/bindings.cc
 msgid "Revert to suggested state for all packages"
 msgstr "Zum vorgeschlagenen Status aller Pakete zurückkehren"
 
-#: dselect/bindings.cc:172
+#: dselect/bindings.cc
 msgid "Revert to directly requested state for all packages"
 msgstr "Zum direkt verlangten Status aller Pakete zurückkehren"
 
-#: dselect/bindings.cc:173
+#: dselect/bindings.cc
 msgid "Revert to currently installed state for all packages"
 msgstr "Zum derzeit installierten Status aller Pakete zurückkehren"
 
-#: dselect/bindings.cc:176
+#: dselect/bindings.cc
 msgid "Select currently-highlighted access method"
 msgstr "Derzeit hervorgehobene Zugriffsmethode auswählen"
 
-#: dselect/bindings.cc:177
+#: dselect/bindings.cc
 msgid "Quit without changing selected access method"
 msgstr "Beenden, ohne die Zugriffsmethode zu ändern"
 
-#: dselect/helpmsgs.cc:29
+#: dselect/helpmsgs.cc
 msgid "Keystrokes"
 msgstr "Tastenkürzel"
 
-#: dselect/helpmsgs.cc:29
+#: dselect/helpmsgs.cc
 msgid ""
 "Motion keys: Next/Previous, Top/End, Up/Down, Backwards/Forwards:\n"
 "  j, Down-arrow         k, Up-arrow             move highlight\n"
@@ -347,7 +347,7 @@ msgstr ""
 "   D     alle auf direkt angef. Zust. setzen  n, \\  letzte Suche "
 "wiederholen\n"
 
-#: dselect/helpmsgs.cc:55
+#: dselect/helpmsgs.cc
 msgid "Introduction to package selections"
 msgstr "Einführung in die Paketauswahl"
 
@@ -356,7 +356,7 @@ msgstr "Einführung in die Paketauswahl"
 # passt. Auf diesen ist nämlich sonst die Hilfe abgeschnitten!
 # Sven Joachim: In UTF-8-Terminals kann die Hilfe trotzdem abgeschnitten
 # werden, da dselect annimmt, dass jedes Zeichen nur 1 Byte breit ist.
-#: dselect/helpmsgs.cc:55
+#: dselect/helpmsgs.cc
 msgid ""
 "Welcome to dselect's main package listing.\n"
 "\n"
@@ -414,11 +414,11 @@ msgstr ""
 "Drücken Sie <Leer>, um die Hilfe zu verlassen und zur Paketliste zu "
 "gelangen.\n"
 
-#: dselect/helpmsgs.cc:80
+#: dselect/helpmsgs.cc
 msgid "Introduction to read-only package list browser"
 msgstr "Einführung in den Nur-Lese-Paketlisten-Browser"
 
-#: dselect/helpmsgs.cc:80
+#: dselect/helpmsgs.cc
 msgid ""
 "Welcome to dselect's main package listing.\n"
 "\n"
@@ -459,12 +459,12 @@ msgstr ""
 "Drücken Sie <Leer>, um die Hilfe zu verlassen und zur Paketliste zu "
 "gelangen.\n"
 
-#: dselect/helpmsgs.cc:99
+#: dselect/helpmsgs.cc
 msgid "Introduction to conflict/dependency resolution sub-list"
 msgstr "Hinweise zur Teilliste zum Auflösen von Konflikten/Abhängigkeiten"
 
 # Auch dieser Hilfebildschirm sollte die 22 Zeilen nicht überschreiten.
-#: dselect/helpmsgs.cc:99
+#: dselect/helpmsgs.cc
 msgid ""
 "Dependency/conflict resolution - introduction.\n"
 "\n"
@@ -528,13 +528,13 @@ msgstr ""
 "Zur der Liste kommen Sie mit der Leertaste; zur Erinnerung: »?« bringt "
 "Hilfe.\n"
 
-#: dselect/helpmsgs.cc:125
+#: dselect/helpmsgs.cc
 msgid "Display, part 1: package listing and status chars"
 msgstr "Anzeige, Teil 1: Paketliste und Statuskürzel"
 
 # Hier sind es bereits im Original 23 Zeilen. Es gibt wohl keine Chance,
 # das zu kürzen.
-#: dselect/helpmsgs.cc:125
+#: dselect/helpmsgs.cc
 msgid ""
 "The top half of the screen shows a list of packages.  For each package you "
 "see\n"
@@ -596,12 +596,12 @@ msgstr ""
 "Auch angezeigt werden Priorität, Bereich, Name, installierte und verfügbare\n"
 "Version (»V« zum Ein-/Ausblenden) der Pakete sowie eine kurze Beschreibung.\n"
 
-#: dselect/helpmsgs.cc:152
+#: dselect/helpmsgs.cc
 msgid "Display, part 2: list highlight; information display"
 msgstr "Anzeige, Teil 2: Listenhervorhebung; Informationsanzeige"
 
 # Daran denken: 22 Zeilen, 80 Zeichen!
-#: dselect/helpmsgs.cc:152
+#: dselect/helpmsgs.cc
 msgid ""
 "* Highlight: One line in the package list will be highlighted.  It "
 "indicates\n"
@@ -654,11 +654,11 @@ msgstr ""
 "  Benutzen Sie »i«, um durch die Anzeigen zu wechseln und »I«, um die\n"
 "  Informationsanzeige zu verstecken oder sie zu vergrößern.\n"
 
-#: dselect/helpmsgs.cc:176
+#: dselect/helpmsgs.cc
 msgid "Introduction to method selection display"
 msgstr "Einführung zum Methoden-Auswahl-Menü"
 
-#: dselect/helpmsgs.cc:176
+#: dselect/helpmsgs.cc
 msgid ""
 "dselect and dpkg can do automatic installation, loading the package files to "
 "be\n"
@@ -700,11 +700,11 @@ msgstr ""
 "Eine Liste aller Tastenkürzel erhalten Sie, wenn sie jetzt die »k«-Taste\n"
 "drücken, oder später aus dem Hilfemenü, erreichbar mit der Taste »?«.\n"
 
-#: dselect/helpmsgs.cc:196
+#: dselect/helpmsgs.cc
 msgid "Keystrokes for method selection"
 msgstr "Tastenkürzel für die Methoden-Auswahl"
 
-#: dselect/helpmsgs.cc:196
+#: dselect/helpmsgs.cc
 msgid ""
 "Motion keys: Next/Previous, Top/End, Up/Down, Backwards/Forwards:\n"
 "  j, Down-arrow         k, Up-arrow             move highlight\n"
@@ -753,106 +753,106 @@ msgstr ""
 "  /                Suchen (Abbruch mit Eingabetaste)\n"
 "  \\                letzte Suche wiederholen\n"
 
-#: dselect/main.cc:63
+#: dselect/main.cc
 msgid "Type dselect --help for help."
 msgstr "Geben Sie dselect --help ein, um Hilfe zu erhalten."
 
-#: dselect/main.cc:145
+#: dselect/main.cc
 msgid "a"
 msgstr "z"
 
-#: dselect/main.cc:145
+#: dselect/main.cc
 msgid "[A]ccess"
 msgstr "[Z]ugriff"
 
-#: dselect/main.cc:145
+#: dselect/main.cc
 msgid "Choose the access method to use."
 msgstr "Zugriffsmethode auswählen."
 
-#: dselect/main.cc:146
+#: dselect/main.cc
 msgid "u"
 msgstr "e"
 
-#: dselect/main.cc:146
+#: dselect/main.cc
 msgid "[U]pdate"
 msgstr "[E]rneuern"
 
-#: dselect/main.cc:146
+#: dselect/main.cc
 msgid "Update list of available packages, if possible."
 msgstr "Liste der verfügbaren Pakete erneuern, falls möglich."
 
-#: dselect/main.cc:147
+#: dselect/main.cc
 msgid "s"
 msgstr "a"
 
-#: dselect/main.cc:147
+#: dselect/main.cc
 msgid "[S]elect"
 msgstr "[A]uswählen"
 
-#: dselect/main.cc:147
+#: dselect/main.cc
 msgid "Request which packages you want on your system."
 msgstr "Auswahl der für Ihr System gewünschten Pakete treffen."
 
-#: dselect/main.cc:148
+#: dselect/main.cc
 msgid "i"
 msgstr "i"
 
-#: dselect/main.cc:148
+#: dselect/main.cc
 msgid "[I]nstall"
 msgstr "[I]nstall."
 
-#: dselect/main.cc:148
+#: dselect/main.cc
 msgid "Install and upgrade wanted packages."
 msgstr "Gewünschte Pakete installieren und aktualisieren."
 
 # Vorsicht Falle: "k" geht leider nicht, denn diese Taste bewegt
 # die Hervorhebung um eine Zeile nach oben!
-#: dselect/main.cc:149
+#: dselect/main.cc
 msgid "c"
 msgstr "f"
 
-#: dselect/main.cc:149
+#: dselect/main.cc
 msgid "[C]onfig"
 msgstr "Kon[f]ig."
 
-#: dselect/main.cc:149
+#: dselect/main.cc
 msgid "Configure any packages that are unconfigured."
 msgstr "Alle unkonfigurierten Pakete konfigurieren."
 
-#: dselect/main.cc:150
+#: dselect/main.cc
 msgid "r"
 msgstr "l"
 
-#: dselect/main.cc:150
+#: dselect/main.cc
 msgid "[R]emove"
 msgstr "[L]öschen"
 
-#: dselect/main.cc:150
+#: dselect/main.cc
 msgid "Remove unwanted software."
 msgstr "Nicht gewünschte Software löschen."
 
-#: dselect/main.cc:151
+#: dselect/main.cc
 msgid "q"
 msgstr "b"
 
-#: dselect/main.cc:151
+#: dselect/main.cc
 msgid "[Q]uit"
 msgstr "[B]eenden"
 
-#: dselect/main.cc:151
+#: dselect/main.cc
 msgid "Quit dselect."
 msgstr "Dselect beenden."
 
-#: dselect/main.cc:152
+#: dselect/main.cc
 msgid "menu"
 msgstr "Menü"
 
-#: dselect/main.cc:157
+#: dselect/main.cc
 #, c-format
 msgid "Debian `%s' package handling frontend version %s.\n"
 msgstr "Debian »%s« Paketverwaltungs-Frontend Version %s.\n"
 
-#: dselect/main.cc:160
+#: dselect/main.cc
 msgid ""
 "This is free software; see the GNU General Public License version 2 or\n"
 "later for copying conditions. There is NO warranty.\n"
@@ -861,29 +861,47 @@ msgstr ""
 "Version 2 oder höher für Kopierbedingungen. Es wird KEINE Haftung "
 "übernommen.\n"
 
-#: dselect/main.cc:169 dselect/main.cc:217
+#: dselect/main.cc
 msgid "<standard output>"
 msgstr "<Standardausgabe>"
 
-#: dselect/main.cc:180
-#, c-format
+#: dselect/main.cc
+#, fuzzy, c-format
+#| msgid ""
+#| "Usage: %s [<option> ...] [<action> ...]\n"
+#| "\n"
 msgid ""
-"Usage: %s [<option> ...] [<action> ...]\n"
+"Usage: %s [<option>...] [<command>...]\n"
 "\n"
 msgstr ""
 "Aufruf: %s [<Option> ...] [<Aktion> ...]\n"
 "\n"
 
-#: dselect/main.cc:184
+#: dselect/main.cc
 #, c-format
+msgid "Commands:\n"
+msgstr ""
+
+#: dselect/main.cc
+#, fuzzy, c-format
+#| msgid ""
+#| "Options:\n"
+#| "  --admindir <directory>     Use <directory> instead of %s.\n"
+#| "  --expert                   Turn on expert mode.\n"
+#| "  --debug <file> | -D<file>  Turn on debugging, sending output to "
+#| "<file>.\n"
+#| "  --colour | --color screenpart:[foreground],[background][:attr[+attr"
+#| "+...]]\n"
+#| "                             Configure screen colours.\n"
+#| "\n"
 msgid ""
 "Options:\n"
-"  --admindir <directory>     Use <directory> instead of %s.\n"
-"  --expert                   Turn on expert mode.\n"
-"  --debug <file> | -D<file>  Turn on debugging, sending output to <file>.\n"
-"  --colour | --color screenpart:[foreground],[background][:attr[+attr+...]]\n"
-"                             Configure screen colours.\n"
-"\n"
+"      --admindir <directory>       Use <directory> instead of %s.\n"
+"      --expert                     Turn on expert mode.\n"
+"  -D, --debug <file>               Turn on debugging, send output to "
+"<file>.\n"
+"      --color <color-spec>         Configure screen colors.\n"
+"      --colour <color-spec>        Ditto.\n"
 msgstr ""
 "Optionen:\n"
 "  --admindir <Verzeichnis>     <Verzeichnis> statt %s verwenden.\n"
@@ -894,73 +912,80 @@ msgstr ""
 "                               Bildschirmfarben konfigurieren.\n"
 "\n"
 
-#: dselect/main.cc:193
-#, c-format
+#: dselect/main.cc
+#, fuzzy, c-format
+#| msgid ""
+#| "  --help                     Show this help message.\n"
+#| "  --version                  Show the version.\n"
+#| "\n"
 msgid ""
-"  --help                     Show this help message.\n"
-"  --version                  Show the version.\n"
+"  -?, --help                       Show this help message.\n"
+"      --version                    Show the version.\n"
 "\n"
 msgstr ""
 "  --help                       Diesen Hilfetext anzeigen.\n"
 "  --version                    Version anzeigen.\n"
 "\n"
 
-#: dselect/main.cc:197
+#: dselect/main.cc
 #, c-format
-msgid "Actions:\n"
-msgstr "Aktionen:\n"
+msgid ""
+"<color-spec> is <screen-part>:[<foreground>],[<background>][:"
+"<attr>[+<attr>]...]\n"
+msgstr ""
 
-#: dselect/main.cc:202
-#, c-format
-msgid "Screenparts:\n"
+#: dselect/main.cc
+#, fuzzy, c-format
+#| msgid "Screenparts:\n"
+msgid "<screen-part> is:"
 msgstr "Bildschirmelemente:\n"
 
-#: dselect/main.cc:207
+#: dselect/main.cc
 #, c-format
-msgid "Colours:\n"
-msgstr "Farben:\n"
+msgid "<color> is:"
+msgstr ""
 
-#: dselect/main.cc:212
+#: dselect/main.cc
 #, c-format
-msgid "Attributes:\n"
-msgstr "Attribute:\n"
+msgid "<attr> is:"
+msgstr ""
 
-#: dselect/main.cc:232
+#: dselect/main.cc
 #, c-format
 msgid "couldn't open debug file `%.255s'\n"
 msgstr "Debug-Datei »%.255s« konnte nicht geöffnet werden\n"
 
 # %s kann unterchiedliches Geschlecht haben (Farbe, Bildschirmelement, Farbattribut)
-#: dselect/main.cc:253
+#: dselect/main.cc
 #, c-format
 msgid "invalid %s '%s'"
 msgstr "%s »%s« ist ungültig"
 
-#: dselect/main.cc:272
+#: dselect/main.cc
 msgid "screen part"
 msgstr "Bildschirmelement"
 
-#: dselect/main.cc:278
+#: dselect/main.cc
 msgid "null colour specification"
 msgstr "Leere Farbspezifikation"
 
-#: dselect/main.cc:286 dselect/main.cc:291
+#: dselect/main.cc
 msgid "colour"
 msgstr "Farbe"
 
-#: dselect/main.cc:299
+#: dselect/main.cc
 msgid "colour attribute"
 msgstr "Farbattribut"
 
-#: dselect/main.cc:333
+#: dselect/main.cc
 msgid "Terminal does not appear to support cursor addressing.\n"
 msgstr "Das Terminal scheint Cursoradressierung nicht zu unterstützen.\n"
 
-#: dselect/main.cc:335
+#: dselect/main.cc
 msgid "Terminal does not appear to support highlighting.\n"
 msgstr "Das Terminal scheint Hervorhebung nicht zu unterstützen.\n"
 
-#: dselect/main.cc:337
+#: dselect/main.cc
 #, c-format
 msgid ""
 "Set your TERM variable correctly, use a better terminal,\n"
@@ -969,11 +994,11 @@ msgstr ""
 "Setzen Sie ihre TERM-Variable richtig, verwenden Sie ein besseres Terminal,\n"
 "oder begnügen Sie sich mit dem Werkzeug %s zur paketweisen Verwaltung.\n"
 
-#: dselect/main.cc:340
+#: dselect/main.cc
 msgid "terminal lacks necessary features, giving up"
 msgstr "Terminal lässt notwendige Fähigkeiten vermissen, Abbruch"
 
-#: dselect/main.cc:425
+#: dselect/main.cc
 msgid ""
 "\n"
 "\n"
@@ -987,7 +1012,7 @@ msgstr ""
 "Drücken Sie <Eingabe> zur Bestätigung.   ^L zeichnet den Bildschirm neu.\n"
 "\n"
 
-#: dselect/main.cc:430
+#: dselect/main.cc
 msgid ""
 "Copyright (C) 1994-1996 Ian Jackson.\n"
 "Copyright (C) 2000,2001 Wichert Akkerman.\n"
@@ -995,7 +1020,7 @@ msgstr ""
 "Copyright (C) 1994-1996 Ian Jackson.\n"
 "Copyright (C) 2000,2001 Wichert Akkerman.\n"
 
-#: dselect/main.cc:436
+#: dselect/main.cc
 msgid ""
 "\n"
 "\n"
@@ -1005,57 +1030,57 @@ msgstr ""
 "\n"
 "Nur-Lese-Zugriff: Lediglich die Vorschau der Auswahlen ist verfügbar!"
 
-#: dselect/main.cc:455
+#: dselect/main.cc
 msgid "failed to getch in main menu"
 msgstr "getch im Hauptmenü fehlgeschlagen"
 
-#: dselect/main.cc:538
+#: dselect/main.cc
 #, c-format
 msgid "unknown action string `%.50s'"
 msgstr "unbekannte Aktionszeichenkette »%.50s«"
 
-#: dselect/methlist.cc:66
+#: dselect/methlist.cc
 msgid "Abbrev."
 msgstr "Abkürz."
 
-#: dselect/methlist.cc:67 dselect/pkgdisplay.cc:188 dselect/pkginfo.cc:110
+#: dselect/methlist.cc dselect/pkgdisplay.cc dselect/pkginfo.cc
 msgid "Description"
 msgstr "Beschreibung"
 
-#: dselect/methlist.cc:73
+#: dselect/methlist.cc
 msgid "dselect - list of access methods"
 msgstr "dselect - Liste der Zugriffsmethoden"
 
-#: dselect/methlist.cc:82
+#: dselect/methlist.cc
 #, c-format
 msgid "Access method `%s'."
 msgstr "Zugriffsmethode »%s«."
 
-#: dselect/methlist.cc:161 dselect/pkglist.cc:587
+#: dselect/methlist.cc dselect/pkglist.cc
 msgid "doupdate failed"
 msgstr "doupdate fehlgeschlagen"
 
-#: dselect/methlist.cc:164 dselect/pkglist.cc:590
+#: dselect/methlist.cc dselect/pkglist.cc
 msgid "failed to unblock SIGWINCH"
 msgstr "SIGWINCH konnte nicht entblockt werden"
 
-#: dselect/methlist.cc:169 dselect/pkglist.cc:595
+#: dselect/methlist.cc dselect/pkglist.cc
 msgid "failed to re-block SIGWINCH"
 msgstr "SIGWINCH konnte nicht erneut blockiert werden"
 
-#: dselect/methlist.cc:170 dselect/pkglist.cc:597
+#: dselect/methlist.cc dselect/pkglist.cc
 msgid "getch failed"
 msgstr "getch fehlgeschlagen"
 
-#: dselect/methlist.cc:187
+#: dselect/methlist.cc
 msgid "Explanation"
 msgstr "Beschreibung"
 
-#: dselect/methlist.cc:197
+#: dselect/methlist.cc
 msgid "No explanation available."
 msgstr "Keine Beschreibung verfügbar."
 
-#: dselect/method.cc:67
+#: dselect/method.cc
 #, c-format
 msgid ""
 "\n"
@@ -1066,7 +1091,7 @@ msgstr ""
 "\n"
 "%s: %s\n"
 
-#: dselect/method.cc:70
+#: dselect/method.cc
 msgid ""
 "\n"
 "Press <enter> to continue."
@@ -1074,190 +1099,200 @@ msgstr ""
 "\n"
 "Drücken Sie <Eingabe> zum Fortsetzen."
 
-#: dselect/method.cc:82
+#: dselect/method.cc
 msgid "cannot unlock access method area"
 msgstr "Zugriffsmethoden-Bereich kann nicht entsperrt werden"
 
-#: dselect/method.cc:96
+#: dselect/method.cc
 msgid "no access methods are available"
 msgstr "Es sind keine Zugriffsmethoden verfügbar"
 
-#: dselect/method.cc:115
+#: dselect/method.cc
 msgid "requested operation requires superuser privilege"
 msgstr "Angeforderte Operation benötigt Superuser-Rechte"
 
-#: dselect/method.cc:118
+#: dselect/method.cc
 msgid "cannot open or create access method lockfile"
 msgstr "Zugriffsmethoden-Sperrdatei kann nicht geöffnet oder angelegt werden"
 
-#: dselect/method.cc:125
+#: dselect/method.cc
 msgid "the access method area is already locked"
 msgstr "Der Zugriffsmethoden-Bereich ist bereits gesperrt"
 
-#: dselect/method.cc:128
+#: dselect/method.cc
 msgid "cannot lock access method area"
 msgstr "Zugriffsmethoden-Bereich kann nicht gesperrt werden"
 
-#: dselect/method.cc:161
+#: dselect/method.cc
 #, c-format
 msgid "Press <enter> to continue.\n"
 msgstr "Drücken Sie <Eingabe> zum Fortfahren.\n"
 
-#: dselect/method.cc:162
+#: dselect/method.cc
 msgid "<standard error>"
 msgstr "<Standardfehlerausgabe>"
 
 # CHECKME
-#: dselect/method.cc:165
+#: dselect/method.cc
 msgid "error reading acknowledgement of program failure message"
 msgstr "Fehler beim Lesen der Bestätigung der Programm-Fehlermeldung"
 
-#: dselect/method.cc:187
+#: dselect/method.cc
 msgid "no access method is selected or configured"
 msgstr "Es ist keine Zugriffsmethode ausgewählt oder konfiguriert"
 
-#: dselect/method.cc:196
+#: dselect/method.cc
 msgid "update available list script"
 msgstr "Skript zur Aktualisierung der Verfügbarkeitsliste"
 
-#: dselect/method.cc:200
+#: dselect/method.cc
 msgid "installation script"
 msgstr "Installationsskript"
 
-#: dselect/method.cc:246
+#: dselect/method.cc
 msgid "query/setup script"
 msgstr "Abfrage-/Einrichtungsskript"
 
 # CHECKME: »Options-Datei« oder »Optionen-Datei«?
-#: dselect/methparse.cc:53
+#: dselect/methparse.cc
 #, c-format
 msgid "syntax error in method options file `%.250s' -- %s"
 msgstr "Syntaxfehler in Methoden-Options-Datei »%.250s« -- %s"
 
-#: dselect/methparse.cc:59
+#: dselect/methparse.cc
 #, c-format
 msgid "error reading options file `%.250s'"
 msgstr "Fehler beim Lesen der Options-Datei »%.250s«"
 
 # CHECKME
-#: dselect/methparse.cc:93
+#: dselect/methparse.cc
 #, c-format
 msgid "unable to read `%.250s' directory for reading methods"
 msgstr "Verzeichnis »%.250s« kann nicht gelesen werden, um Methoden zu lesen"
 
-#: dselect/methparse.cc:109
+#: dselect/methparse.cc
 #, c-format
 msgid "method `%.250s' has name that is too long (%d > %d characters)"
 msgstr "Methode »%.250s« hat einen zu langen Namen (%d > %d Zeichen)"
 
-#: dselect/methparse.cc:120
+#: dselect/methparse.cc
 #, c-format
 msgid "unable to access method script `%.250s'"
 msgstr "Auf Methodenskript »%.250s« kann nicht zugegriffen werden"
 
-#: dselect/methparse.cc:126
+#: dselect/methparse.cc
 #, c-format
 msgid "unable to read method options file `%.250s'"
 msgstr "Methoden-Options-Datei »%.250s« kann nicht gelesen werden"
 
-#: dselect/methparse.cc:150
+#: dselect/methparse.cc
 msgid "non-digit where digit wanted"
 msgstr "Nichtziffer, wo Ziffer erwartet wurde"
 
-#: dselect/methparse.cc:153
-msgid "EOF in index string"
+#: dselect/methparse.cc
+#, fuzzy
+#| msgid "EOF in index string"
+msgid "end of file in index string"
 msgstr "EOF in Indexzeichenkette"
 
-#: dselect/methparse.cc:156
+#: dselect/methparse.cc
 msgid "index string too long"
 msgstr "Indexzeichenkette zu lang"
 
-#: dselect/methparse.cc:159
+#: dselect/methparse.cc
 msgid "newline before option name start"
 msgstr "Zeilenvorschub vor Optionsnamenanfang"
 
-#: dselect/methparse.cc:161
-msgid "EOF before option name start"
-msgstr "EOF vor Optionsnamenanfang"
+#: dselect/methparse.cc
+#, fuzzy
+#| msgid "newline before option name start"
+msgid "end of file before option name start"
+msgstr "Zeilenvorschub vor Optionsnamenanfang"
 
-#: dselect/methparse.cc:165
+#: dselect/methparse.cc
 msgid "nonalpha where option name start wanted"
 msgstr "Nichtbuchstabe, wo Anfang eines Optionsnamen erwartet wurde"
 
-#: dselect/methparse.cc:167
+#: dselect/methparse.cc
 msgid "non-alphanum in option name"
 msgstr "nicht-alphanumerisches Zeichen im Optionsnamen"
 
-#: dselect/methparse.cc:170
-msgid "EOF in option name"
+#: dselect/methparse.cc
+#, fuzzy
+#| msgid "EOF in option name"
+msgid "end of file in option name"
 msgstr "EOF im Optionsnamen"
 
-#: dselect/methparse.cc:175
+#: dselect/methparse.cc
 msgid "newline before summary"
 msgstr "Zeilenvorschub vor Zusammenfassung"
 
-#: dselect/methparse.cc:177
-msgid "EOF before summary"
-msgstr "EOF vor Zusammenfassung"
+#: dselect/methparse.cc
+#, fuzzy
+#| msgid "newline before summary"
+msgid "end of file before summary"
+msgstr "Zeilenvorschub vor Zusammenfassung"
 
-#: dselect/methparse.cc:183
-msgid "EOF in summary - missing newline"
+#: dselect/methparse.cc
+#, fuzzy
+#| msgid "EOF in summary - missing newline"
+msgid "end of file in summary - missing newline"
 msgstr "EOF in Zusammenfassung - Zeilenvorschub fehlt"
 
-#: dselect/methparse.cc:193
+#: dselect/methparse.cc
 #, c-format
 msgid "unable to open option description file `%.250s'"
 msgstr "Options-Beschreibungs-Datei »%.250s« kann nicht geöffnet werden"
 
-#: dselect/methparse.cc:197
+#: dselect/methparse.cc
 #, c-format
 msgid "unable to stat option description file `%.250s'"
 msgstr ""
 "Options-Beschreibungs-Datei »%.250s« kann nicht mit stat abgefragt werden"
 
-#: dselect/methparse.cc:201
+#: dselect/methparse.cc
 #, c-format
 msgid "failed to read option description file `%.250s'"
 msgstr "Options-Beschreibungs-Datei »%.250s« konnte nicht gelesen werden"
 
-#: dselect/methparse.cc:204
+#: dselect/methparse.cc
 #, c-format
 msgid "error during read of option description file `%.250s'"
 msgstr "Fehler beim Lesen der Options-Beschreibungs-Datei »%.250s«"
 
-#: dselect/methparse.cc:227
+#: dselect/methparse.cc
 #, c-format
 msgid "error during read of method options file `%.250s'"
 msgstr "Fehler beim Lesen der Methoden-Options-Datei »%.250s«"
 
-#: dselect/methparse.cc:250
+#: dselect/methparse.cc
 #, c-format
 msgid "unable to open current option file `%.250s'"
 msgstr "Aktuelle Options-Datei »%.250s« kann nicht geöffnet werden"
 
 # FIXME: Wäre »new option file« nicht besser?
-#: dselect/methparse.cc:286
+#: dselect/methparse.cc
 #, c-format
 msgid "unable to write new option to `%.250s'"
 msgstr "Neue Options-Datei kann nicht nach »%.250s« geschrieben werden"
 
-#: dselect/pkgdisplay.cc:36
+#: dselect/pkgdisplay.cc
 msgid "new package"
 msgstr "neues Paket"
 
-#: dselect/pkgdisplay.cc:37
+#: dselect/pkgdisplay.cc
 msgid "install"
 msgstr "install."
 
-#: dselect/pkgdisplay.cc:38
+#: dselect/pkgdisplay.cc
 msgid "hold"
 msgstr "halten"
 
-#: dselect/pkgdisplay.cc:39
+#: dselect/pkgdisplay.cc
 msgid "remove"
 msgstr "löschen"
 
-#: dselect/pkgdisplay.cc:40
+#: dselect/pkgdisplay.cc
 msgid "purge"
 msgstr "vollständig löschen"
 
@@ -1265,43 +1300,43 @@ msgstr "vollständig löschen"
 #. * the empty string to store information about the translation. DO NOT
 #. * CHANGE THAT IN A TRANSLATION! The code really relies on that being
 #. * a single space.
-#: dselect/pkgdisplay.cc:47
+#: dselect/pkgdisplay.cc
 msgid " "
 msgstr " "
 
-#: dselect/pkgdisplay.cc:48
+#: dselect/pkgdisplay.cc
 msgid "REINSTALL"
 msgstr "REINSTALL"
 
-#: dselect/pkgdisplay.cc:51
+#: dselect/pkgdisplay.cc
 msgid "not installed"
 msgstr "nicht installiert"
 
-#: dselect/pkgdisplay.cc:52
+#: dselect/pkgdisplay.cc
 msgid "removed (configs remain)"
 msgstr "entfernt (Konfiguration bleibt)"
 
-#: dselect/pkgdisplay.cc:53
+#: dselect/pkgdisplay.cc
 msgid "half installed"
 msgstr "halb installiert"
 
-#: dselect/pkgdisplay.cc:54
+#: dselect/pkgdisplay.cc
 msgid "unpacked (not set up)"
 msgstr "entpackt (nicht eingerichtet)"
 
-#: dselect/pkgdisplay.cc:55
+#: dselect/pkgdisplay.cc
 msgid "half configured (config failed)"
 msgstr "halb konfiguriert (Konfiguration fehlgeschlagen)"
 
-#: dselect/pkgdisplay.cc:56
+#: dselect/pkgdisplay.cc
 msgid "awaiting trigger processing"
 msgstr "auf Trigger-Verarbeitung wartend"
 
-#: dselect/pkgdisplay.cc:57
+#: dselect/pkgdisplay.cc
 msgid "triggered"
 msgstr "getriggered"
 
-#: dselect/pkgdisplay.cc:58
+#: dselect/pkgdisplay.cc
 msgid "installed"
 msgstr "installiert"
 
@@ -1309,299 +1344,291 @@ msgstr "installiert"
 # in der Statuszeile sowie (bei ausführlicher Anzeige) in der
 # Prioritätsspalte auf, das sieht richtig blöd aus!
 # CHECKME: Groß- oder Kleinschreibung?
-#: dselect/pkgdisplay.cc:61
+#: dselect/pkgdisplay.cc
 msgid "Required"
 msgstr "Erforderliche"
 
-#: dselect/pkgdisplay.cc:62
+#: dselect/pkgdisplay.cc
 msgid "Important"
 msgstr "Wichtige"
 
 # FIXME: Weder »Standard- Pakete« noch »Standard Pakete« ist toll :-(
-#: dselect/pkgdisplay.cc:63
+#: dselect/pkgdisplay.cc
 msgid "Standard"
 msgstr "Standard"
 
-#: dselect/pkgdisplay.cc:64
+#: dselect/pkgdisplay.cc
 msgid "Optional"
 msgstr "Optionale"
 
 # FIXME, siehe »Standard« oben
-#: dselect/pkgdisplay.cc:65
+#: dselect/pkgdisplay.cc
 msgid "Extra"
 msgstr "Extra"
 
-#: dselect/pkgdisplay.cc:66
-msgid "!Bug!"
-msgstr "!Fehler!"
-
-#: dselect/pkgdisplay.cc:67
+#: dselect/pkgdisplay.cc
 msgid "Unclassified"
 msgstr "Unklassifizierte"
 
 # CHECKME: Der Unterschied zwischen »befürwortet« und »empfiehlt«
 # dürfte vielen Leuten nicht so ohne weiteres klar sein.
 # Leider geht »schlägt vor« nicht: Paket A schlägt vor Paket B ... :-(
-#: dselect/pkgdisplay.cc:70
+#: dselect/pkgdisplay.cc
 msgid "suggests"
 msgstr "befürwortet"
 
-#: dselect/pkgdisplay.cc:71
+#: dselect/pkgdisplay.cc
 msgid "recommends"
 msgstr "empfiehlt"
 
-#: dselect/pkgdisplay.cc:72
+#: dselect/pkgdisplay.cc
 msgid "depends on"
 msgstr "hängt ab von"
 
-#: dselect/pkgdisplay.cc:73
+#: dselect/pkgdisplay.cc
 msgid "pre-depends on"
 msgstr "hängt ab (vorher) von"
 
 # CHECKME: breaks ist keine symmetrische Beziehung
-#: dselect/pkgdisplay.cc:74
+#: dselect/pkgdisplay.cc
 msgid "breaks"
 msgstr "beschädigt"
 
-#: dselect/pkgdisplay.cc:75
+#: dselect/pkgdisplay.cc
 msgid "conflicts with"
 msgstr "kollidiert mit"
 
-#: dselect/pkgdisplay.cc:76
+#: dselect/pkgdisplay.cc
 msgid "provides"
 msgstr "liefert"
 
-#: dselect/pkgdisplay.cc:77
+#: dselect/pkgdisplay.cc
 msgid "replaces"
 msgstr "ersetzt"
 
-#: dselect/pkgdisplay.cc:78
+#: dselect/pkgdisplay.cc
 msgid "enhances"
 msgstr "erweitert"
 
-#: dselect/pkgdisplay.cc:81
+#: dselect/pkgdisplay.cc
 msgid "Req"
 msgstr "Erf"
 
-#: dselect/pkgdisplay.cc:82
+#: dselect/pkgdisplay.cc
 msgid "Imp"
 msgstr "Wic"
 
-#: dselect/pkgdisplay.cc:83
+#: dselect/pkgdisplay.cc
 msgid "Std"
 msgstr "Std"
 
-#: dselect/pkgdisplay.cc:84
+#: dselect/pkgdisplay.cc
 msgid "Opt"
 msgstr "Opt"
 
-#: dselect/pkgdisplay.cc:85
+#: dselect/pkgdisplay.cc
 msgid "Xtr"
 msgstr "Ext"
 
-#: dselect/pkgdisplay.cc:86
+#: dselect/pkgdisplay.cc
 msgid "bUG"
 msgstr "bUG"
 
-#: dselect/pkgdisplay.cc:87
+#: dselect/pkgdisplay.cc
 msgid "?"
 msgstr "?"
 
-#: dselect/pkgdisplay.cc:95 dselect/pkgdisplay.cc:115
+#: dselect/pkgdisplay.cc
 msgid "Broken"
 msgstr "Defekte"
 
-#: dselect/pkgdisplay.cc:96
+#: dselect/pkgdisplay.cc
 msgid "New"
 msgstr "Neue"
 
-# FIXME: "Upgradable" (wie in aptitude) wäre besser
-#: dselect/pkgdisplay.cc:97
-msgid "Updated"
-msgstr "Aktualisierte"
+#: dselect/pkgdisplay.cc
+msgid "Upgradable"
+msgstr ""
 
-#: dselect/pkgdisplay.cc:98
+#: dselect/pkgdisplay.cc
 msgid "Obsolete/local"
 msgstr "Veraltete/Lokale"
 
-#: dselect/pkgdisplay.cc:99
-msgid "Up-to-date"
-msgstr "Aktuelle"
+#: dselect/pkgdisplay.cc
+msgid "Installed"
+msgstr "Installiert"
 
-#: dselect/pkgdisplay.cc:100
+#: dselect/pkgdisplay.cc
 msgid "Available"
 msgstr "Verfügbare"
 
-#: dselect/pkgdisplay.cc:101 dselect/pkgdisplay.cc:117
+#: dselect/pkgdisplay.cc
 msgid "Removed"
 msgstr "Entfernte"
 
-#: dselect/pkgdisplay.cc:102 dselect/pkgdisplay.cc:111
+#: dselect/pkgdisplay.cc
 msgid "Brokenly installed packages"
 msgstr "Unvollständig installierte Pakete"
 
-#: dselect/pkgdisplay.cc:103
+#: dselect/pkgdisplay.cc
 msgid "Newly available packages"
 msgstr "Neu verfügbare Pakete"
 
-# FIXME: "Upgradable", s.o.
-#: dselect/pkgdisplay.cc:104
-msgid "Updated packages (newer version is available)"
-msgstr "Aktualisierte Pakete (neuere Version ist verfügbar)"
+#: dselect/pkgdisplay.cc
+#, fuzzy
+#| msgid "Newly available packages"
+msgid "Upgradable packages"
+msgstr "Neu verfügbare Pakete"
 
 # CHECKME: »vorhanden« streichen?
-#: dselect/pkgdisplay.cc:105
-msgid "Obsolete and local packages present on system"
+#: dselect/pkgdisplay.cc
+#, fuzzy
+#| msgid "Obsolete and local packages present on system"
+msgid "Obsolete and locally created packages"
 msgstr "Veraltete und lokale Pakete im System vorhanden"
 
-#: dselect/pkgdisplay.cc:106
-msgid "Up to date installed packages"
-msgstr "Aktuelle installierte Pakete"
+#: dselect/pkgdisplay.cc
+msgid "Installed packages"
+msgstr "Installierte Pakete"
 
-#: dselect/pkgdisplay.cc:107
-msgid "Available packages (not currently installed)"
-msgstr "Verfügbare Pakete (derzeit nicht installiert)"
+#: dselect/pkgdisplay.cc
+#, fuzzy
+#| msgid "Up to date installed packages"
+msgid "Available not installed packages"
+msgstr "Aktuelle installierte Pakete"
 
-#: dselect/pkgdisplay.cc:108
+#: dselect/pkgdisplay.cc
 msgid "Removed and no longer available packages"
 msgstr "Entfernte und nicht mehr verfügbare Pakete"
 
-#: dselect/pkgdisplay.cc:112
-msgid "Installed packages"
-msgstr "Installierte Pakete"
-
-#: dselect/pkgdisplay.cc:113
+#: dselect/pkgdisplay.cc
 msgid "Removed packages (configuration still present)"
 msgstr "Entfernte Pakete (Konfigurationsdateien sind noch vorhanden)"
 
-#: dselect/pkgdisplay.cc:114
+#: dselect/pkgdisplay.cc
 msgid "Purged packages and those never installed"
 msgstr "Vollständig gelöschte und noch nie installierte Pakete"
 
-#: dselect/pkgdisplay.cc:116
-msgid "Installed"
-msgstr "Installiert"
-
-#: dselect/pkgdisplay.cc:118
+#: dselect/pkgdisplay.cc
 msgid "Purged"
 msgstr "Vollständig gelöscht"
 
-#: dselect/pkgdisplay.cc:138
+#: dselect/pkgdisplay.cc
 msgid "Error"
 msgstr "Fehler"
 
-#: dselect/pkgdisplay.cc:139
+#: dselect/pkgdisplay.cc
 msgid "Installed?"
 msgstr "Installiert?"
 
 # "Alte Markierung" würde abgeschnitten
-#: dselect/pkgdisplay.cc:140
+#: dselect/pkgdisplay.cc
 msgid "Old mark"
 msgstr "Alte Marke"
 
 # FIXME: Nach 10 oder 11 Zeichen wird abgeschnitten :-(
-#: dselect/pkgdisplay.cc:141
+#: dselect/pkgdisplay.cc
 msgid "Marked for"
 msgstr "Ausgewählt zur"
 
-#: dselect/pkgdisplay.cc:143
+#: dselect/pkgdisplay.cc
 msgid "EIOM"
 msgstr "FIAM"
 
-#: dselect/pkgdisplay.cc:147 dselect/pkgdisplay.cc:150
+#: dselect/pkgdisplay.cc
 msgid "Section"
 msgstr "Bereich"
 
 # FIXME: Nach 8 Zeichen wird abgeschnitten :-(
-#: dselect/pkgdisplay.cc:148
+#: dselect/pkgdisplay.cc
 msgid "Priority"
 msgstr "Priorität"
 
-#: dselect/pkgdisplay.cc:152
+#: dselect/pkgdisplay.cc
 msgid "Package"
 msgstr "Paket"
 
-#: dselect/pkgdisplay.cc:161 dselect/pkgdisplay.cc:165
+#: dselect/pkgdisplay.cc
 msgid "Avail.arch"
 msgstr "Verf.Arch"
 
-#: dselect/pkgdisplay.cc:164
+#: dselect/pkgdisplay.cc
 msgid "Inst.arch"
 msgstr "Inst.Arch"
 
-#: dselect/pkgdisplay.cc:178 dselect/pkgdisplay.cc:182
+#: dselect/pkgdisplay.cc
 msgid "Avail.ver"
 msgstr "Verf.Ver"
 
-#: dselect/pkgdisplay.cc:181
+#: dselect/pkgdisplay.cc
 msgid "Inst.ver"
 msgstr "Inst.Ver"
 
-#: dselect/pkgdisplay.cc:197
+#: dselect/pkgdisplay.cc
 msgid "dselect - recursive package listing"
 msgstr "dselect - Rekursive Paketliste"
 
-#: dselect/pkgdisplay.cc:199
+#: dselect/pkgdisplay.cc
 msgid "dselect - inspection of package states"
 msgstr "dselect - Ansicht der Paketzustände"
 
-#: dselect/pkgdisplay.cc:200
+#: dselect/pkgdisplay.cc
 msgid "dselect - main package listing"
 msgstr "dselect - Hauptpaketliste"
 
-#: dselect/pkgdisplay.cc:208
+#: dselect/pkgdisplay.cc
 msgid " (by section)"
 msgstr " (nach Bereich)"
 
-#: dselect/pkgdisplay.cc:211
+#: dselect/pkgdisplay.cc
 msgid " (avail., section)"
 msgstr " (Verfüg., Bereich)"
 
-#: dselect/pkgdisplay.cc:214
+#: dselect/pkgdisplay.cc
 msgid " (status, section)"
 msgstr " (Status, Bereich)"
 
-#: dselect/pkgdisplay.cc:223
+#: dselect/pkgdisplay.cc
 msgid " (by priority)"
 msgstr " (nach Priorität)"
 
-#: dselect/pkgdisplay.cc:226
+#: dselect/pkgdisplay.cc
 msgid " (avail., priority)"
 msgstr " (Verfüg., Priorität)"
 
-#: dselect/pkgdisplay.cc:229
+#: dselect/pkgdisplay.cc
 msgid " (status, priority)"
 msgstr " (Status, Priorität)"
 
-#: dselect/pkgdisplay.cc:238
+#: dselect/pkgdisplay.cc
 msgid " (alphabetically)"
 msgstr " (alphabetisch)"
 
-#: dselect/pkgdisplay.cc:241
+#: dselect/pkgdisplay.cc
 msgid " (by availability)"
 msgstr " (nach Verfügbarkeit)"
 
-#: dselect/pkgdisplay.cc:244
+#: dselect/pkgdisplay.cc
 msgid " (by status)"
 msgstr " (nach Status)"
 
-#: dselect/pkgdisplay.cc:259
+#: dselect/pkgdisplay.cc
 msgid " mark:+/=/- terse:v help:?"
 msgstr " Mark:+/=/- knapp:v Hilfe:?"
 
-#: dselect/pkgdisplay.cc:260
+#: dselect/pkgdisplay.cc
 msgid " mark:+/=/- verbose:v help:?"
 msgstr " Mark:+/=/- ausführlich:v Hilfe:?"
 
-#: dselect/pkgdisplay.cc:262
+#: dselect/pkgdisplay.cc
 msgid " terse:v help:?"
 msgstr " knapp:v Hilfe:?"
 
-#: dselect/pkgdisplay.cc:263
+#: dselect/pkgdisplay.cc
 msgid " verbose:v help:?"
 msgstr " ausführlich:v Hilfe:?"
 
-#: dselect/pkginfo.cc:85
+#: dselect/pkginfo.cc
 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 "
@@ -1621,82 +1648,114 @@ msgstr ""
 "Sie können »o« und »O« benutzen, um die Sortierreihenfolge zu ändern und "
 "damit die Pakete in anderen Gruppen zu markieren."
 
-#: dselect/pkginfo.cc:98
+#: dselect/pkginfo.cc
 msgid "Interrelationships"
 msgstr "Gegenseitige Beziehungen"
 
-#: dselect/pkginfo.cc:117
+#: dselect/pkginfo.cc
 msgid "No description available."
 msgstr "Keine Beschreibung verfügbar."
 
-#: dselect/pkginfo.cc:135
+#: dselect/pkginfo.cc
 msgid "Installed control file information"
 msgstr "Installierte Control-Datei-Informationen"
 
-#: dselect/pkginfo.cc:151
+#: dselect/pkginfo.cc
 msgid "Available control file information"
 msgstr "Verfügbare Control-Datei-Informationen"
 
-#: dselect/pkglist.cc:425
+#: dselect/pkglist.cc
 msgid "there are no packages"
 msgstr "Es gibt keine Pakete"
 
-#: dselect/pkglist.cc:521
+#: dselect/pkglist.cc
 msgid "invalid search option given"
 msgstr "ungültige Suchoption angegeben"
 
-#: dselect/pkglist.cc:536
+#: dselect/pkglist.cc
 msgid "error in regular expression"
 msgstr "Fehler in regulärem Ausdruck"
 
-#: dselect/pkgsublist.cc:111
+#: dselect/pkgsublist.cc
 msgid " does not appear to be available\n"
 msgstr " scheint nicht verfügbar zu sein\n"
 
-#: dselect/pkgsublist.cc:131
+#: dselect/pkgsublist.cc
 msgid " or "
 msgstr " oder "
 
-#: dselect/pkgtop.cc:58
+#: dselect/pkgtop.cc
 msgid "All"
 msgstr "Alle"
 
-#: dselect/pkgtop.cc:80
+#: dselect/pkgtop.cc
 msgid "All packages"
 msgstr "Alle Pakete"
 
 # CHECKME
-#: dselect/pkgtop.cc:84
+#: dselect/pkgtop.cc
 #, c-format
 msgid "%s packages without a section"
 msgstr "%s Pakete ohne einen Bereich"
 
-#: dselect/pkgtop.cc:86
+#: dselect/pkgtop.cc
 #, c-format
 msgid "%s packages in section %s"
 msgstr "%s Pakete im Bereich %s"
 
-#: dselect/pkgtop.cc:92
+#: dselect/pkgtop.cc
 #, c-format
 msgid "%s %s packages"
 msgstr "%s %s Pakete"
 
 # CHECKME
-#: dselect/pkgtop.cc:96
+#: dselect/pkgtop.cc
 #, c-format
 msgid "%s %s packages without a section"
 msgstr "%s %s Pakete ohne einen Bereich"
 
-#: dselect/pkgtop.cc:98
+#: dselect/pkgtop.cc
 #, c-format
 msgid "%s %s packages in section %s"
 msgstr "%s %s Pakete im Bereich %s"
 
-#: dselect/pkgtop.cc:119
+#: dselect/pkgtop.cc
 #, c-format
 msgid "%-*s %s%s%s;  %s (was: %s).  %s"
 msgstr "%-*s %s%s%s;  %s (war: %s).  %s"
 
+#~ msgid "Actions:\n"
+#~ msgstr "Aktionen:\n"
+
+#~ msgid "Colours:\n"
+#~ msgstr "Farben:\n"
+
+#~ msgid "Attributes:\n"
+#~ msgstr "Attribute:\n"
+
+#~ msgid "EOF before option name start"
+#~ msgstr "EOF vor Optionsnamenanfang"
+
+#~ msgid "EOF before summary"
+#~ msgstr "EOF vor Zusammenfassung"
+
+#~ msgid "!Bug!"
+#~ msgstr "!Fehler!"
+
+# FIXME: "Upgradable" (wie in aptitude) wäre besser
+#~ msgid "Updated"
+#~ msgstr "Aktualisierte"
+
+#~ msgid "Up-to-date"
+#~ msgstr "Aktuelle"
+
+# FIXME: "Upgradable", s.o.
+#~ msgid "Updated packages (newer version is available)"
+#~ msgstr "Aktualisierte Pakete (neuere Version ist verfügbar)"
+
+#~ msgid "Available packages (not currently installed)"
+#~ msgstr "Verfügbare Pakete (derzeit nicht installiert)"
+
 #~ msgid "foreign architectures enabled but multi-arch is not supported"
 #~ msgstr ""
 #~ "Fremde Architekturen aktiviert, aber Multi-Arch wird nicht unterstützt"
diff --git a/dselect/po/dselect.pot b/dselect/po/dselect.pot
index eabd92e69..4cbd679b1 100644
--- a/dselect/po/dselect.pot
+++ b/dselect/po/dselect.pot
@@ -6,9 +6,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: dpkg 1.17.23\n"
+"Project-Id-Version: dpkg 1.18.0\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2014-12-23 18:12+0100\n"
+"POT-Creation-Date: 2015-04-06 09:37+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"
@@ -17,265 +17,265 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: dselect/basecmds.cc:125
+#: dselect/basecmds.cc
 msgid "Search for ? "
 msgstr ""
 
-#: dselect/basecmds.cc:149
+#: dselect/basecmds.cc
 msgid "Error: "
 msgstr ""
 
-#: dselect/basecmds.cc:180
+#: dselect/basecmds.cc
 msgid "Help: "
 msgstr ""
 
-#: dselect/basecmds.cc:186
+#: dselect/basecmds.cc
 msgid "Press ? for help menu, . for next topic, <space> to exit help."
 msgstr ""
 
-#: dselect/basecmds.cc:193
+#: dselect/basecmds.cc
 msgid "Help information is available under the following topics:"
 msgstr ""
 
-#: dselect/basecmds.cc:201
+#: dselect/basecmds.cc
 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:207
+#: dselect/basecmds.cc
 msgid "error reading keyboard in help"
 msgstr ""
 
-#: dselect/baselist.cc:60
+#: dselect/baselist.cc
 msgid "ioctl(TIOCGWINSZ) failed"
 msgstr ""
 
-#: dselect/baselist.cc:63
+#: dselect/baselist.cc
 msgid "doupdate in SIGWINCH handler failed"
 msgstr ""
 
-#: dselect/baselist.cc:72
+#: dselect/baselist.cc
 msgid "failed to restore old SIGWINCH sigact"
 msgstr ""
 
-#: dselect/baselist.cc:75
+#: dselect/baselist.cc
 msgid "failed to restore old signal mask"
 msgstr ""
 
-#: dselect/baselist.cc:86
+#: dselect/baselist.cc
 msgid "failed to get old signal mask"
 msgstr ""
 
-#: dselect/baselist.cc:88
+#: dselect/baselist.cc
 msgid "failed to get old SIGWINCH sigact"
 msgstr ""
 
-#: dselect/baselist.cc:93
+#: dselect/baselist.cc
 msgid "failed to block SIGWINCH"
 msgstr ""
 
-#: dselect/baselist.cc:99
+#: dselect/baselist.cc
 msgid "failed to set new SIGWINCH sigact"
 msgstr ""
 
-#: dselect/baselist.cc:174
+#: dselect/baselist.cc
 msgid "failed to allocate colour pair"
 msgstr ""
 
-#: dselect/baselist.cc:203
+#: dselect/baselist.cc
 msgid "failed to create title window"
 msgstr ""
 
-#: dselect/baselist.cc:207
+#: dselect/baselist.cc
 msgid "failed to create whatinfo window"
 msgstr ""
 
-#: dselect/baselist.cc:211
+#: dselect/baselist.cc
 msgid "failed to create baselist pad"
 msgstr ""
 
-#: dselect/baselist.cc:214
+#: dselect/baselist.cc
 msgid "failed to create heading pad"
 msgstr ""
 
-#: dselect/baselist.cc:218
+#: dselect/baselist.cc
 msgid "failed to create thisstate pad"
 msgstr ""
 
-#: dselect/baselist.cc:222
+#: dselect/baselist.cc
 msgid "failed to create info pad"
 msgstr ""
 
-#: dselect/baselist.cc:227
+#: dselect/baselist.cc
 msgid "failed to create query window"
 msgstr ""
 
-#: dselect/baselist.cc:298
+#: dselect/baselist.cc
 msgid "Keybindings"
 msgstr ""
 
-#: dselect/baselist.cc:347
+#: dselect/baselist.cc
 #, c-format
 msgid "  -- %d%%, press "
 msgstr ""
 
-#: dselect/baselist.cc:350
+#: dselect/baselist.cc
 #, c-format
 msgid "%s for more"
 msgstr ""
 
-#: dselect/baselist.cc:354
+#: dselect/baselist.cc
 #, c-format
 msgid "%s to go back"
 msgstr ""
 
-#: dselect/bindings.cc:78
+#: dselect/bindings.cc
 msgid "[not bound]"
 msgstr ""
 
-#: dselect/bindings.cc:82
+#: dselect/bindings.cc
 #, c-format
 msgid "[unk: %d]"
 msgstr ""
 
-#: dselect/bindings.cc:141
+#: dselect/bindings.cc
 msgid "Scroll onwards through help/information"
 msgstr ""
 
-#: dselect/bindings.cc:142
+#: dselect/bindings.cc
 msgid "Scroll backwards through help/information"
 msgstr ""
 
-#: dselect/bindings.cc:143
+#: dselect/bindings.cc
 msgid "Move up"
 msgstr ""
 
-#: dselect/bindings.cc:144
+#: dselect/bindings.cc
 msgid "Move down"
 msgstr ""
 
-#: dselect/bindings.cc:145
+#: dselect/bindings.cc
 msgid "Go to top of list"
 msgstr ""
 
-#: dselect/bindings.cc:146
+#: dselect/bindings.cc
 msgid "Go to end of list"
 msgstr ""
 
-#: dselect/bindings.cc:147
+#: dselect/bindings.cc
 msgid "Request help (cycle through help screens)"
 msgstr ""
 
-#: dselect/bindings.cc:148
+#: dselect/bindings.cc
 msgid "Cycle through information displays"
 msgstr ""
 
-#: dselect/bindings.cc:149
+#: dselect/bindings.cc
 msgid "Redraw display"
 msgstr ""
 
-#: dselect/bindings.cc:150
+#: dselect/bindings.cc
 msgid "Scroll onwards through list by 1 line"
 msgstr ""
 
-#: dselect/bindings.cc:151
+#: dselect/bindings.cc
 msgid "Scroll backwards through list by 1 line"
 msgstr ""
 
-#: dselect/bindings.cc:152
+#: dselect/bindings.cc
 msgid "Scroll onwards through help/information by 1 line"
 msgstr ""
 
-#: dselect/bindings.cc:153
+#: dselect/bindings.cc
 msgid "Scroll backwards through help/information by 1 line"
 msgstr ""
 
-#: dselect/bindings.cc:154
+#: dselect/bindings.cc
 msgid "Scroll onwards through list"
 msgstr ""
 
-#: dselect/bindings.cc:155
+#: dselect/bindings.cc
 msgid "Scroll backwards through list"
 msgstr ""
 
-#: dselect/bindings.cc:158
+#: dselect/bindings.cc
 msgid "Mark package(s) for installation"
 msgstr ""
 
-#: dselect/bindings.cc:159
+#: dselect/bindings.cc
 msgid "Mark package(s) for deinstallation"
 msgstr ""
 
-#: dselect/bindings.cc:160
+#: dselect/bindings.cc
 msgid "Mark package(s) for deinstall and purge"
 msgstr ""
 
-#: dselect/bindings.cc:161
+#: dselect/bindings.cc
 msgid "Make highlight more specific"
 msgstr ""
 
-#: dselect/bindings.cc:162
+#: dselect/bindings.cc
 msgid "Make highlight less specific"
 msgstr ""
 
-#: dselect/bindings.cc:163
+#: dselect/bindings.cc
 msgid "Search for a package whose name contains a string"
 msgstr ""
 
-#: dselect/bindings.cc:164
+#: dselect/bindings.cc
 msgid "Repeat last search"
 msgstr ""
 
-#: dselect/bindings.cc:165
+#: dselect/bindings.cc
 msgid "Swap sort order priority/section"
 msgstr ""
 
-#: dselect/bindings.cc:166
+#: dselect/bindings.cc
 msgid "Quit, confirming, and checking dependencies"
 msgstr ""
 
-#: dselect/bindings.cc:167
+#: dselect/bindings.cc
 msgid "Quit, confirming without check"
 msgstr ""
 
-#: dselect/bindings.cc:168
+#: dselect/bindings.cc
 msgid "Quit, rejecting conflict/dependency suggestions"
 msgstr ""
 
-#: dselect/bindings.cc:169
+#: dselect/bindings.cc
 msgid "Abort - quit without making changes"
 msgstr ""
 
-#: dselect/bindings.cc:170
+#: dselect/bindings.cc
 msgid "Revert to old state for all packages"
 msgstr ""
 
-#: dselect/bindings.cc:171
+#: dselect/bindings.cc
 msgid "Revert to suggested state for all packages"
 msgstr ""
 
-#: dselect/bindings.cc:172
+#: dselect/bindings.cc
 msgid "Revert to directly requested state for all packages"
 msgstr ""
 
-#: dselect/bindings.cc:173
+#: dselect/bindings.cc
 msgid "Revert to currently installed state for all packages"
 msgstr ""
 
-#: dselect/bindings.cc:176
+#: dselect/bindings.cc
 msgid "Select currently-highlighted access method"
 msgstr ""
 
-#: dselect/bindings.cc:177
+#: dselect/bindings.cc
 msgid "Quit without changing selected access method"
 msgstr ""
 
-#: dselect/helpmsgs.cc:29
+#: dselect/helpmsgs.cc
 msgid "Keystrokes"
 msgstr ""
 
-#: dselect/helpmsgs.cc:29
+#: dselect/helpmsgs.cc
 msgid ""
 "Motion keys: Next/Previous, Top/End, Up/Down, Backwards/Forwards:\n"
 "  j, Down-arrow         k, Up-arrow             move highlight\n"
@@ -307,11 +307,11 @@ msgid ""
 "   D     set all to Directly requested state  n, \\  repeat last search\n"
 msgstr ""
 
-#: dselect/helpmsgs.cc:55
+#: dselect/helpmsgs.cc
 msgid "Introduction to package selections"
 msgstr ""
 
-#: dselect/helpmsgs.cc:55
+#: dselect/helpmsgs.cc
 msgid ""
 "Welcome to dselect's main package listing.\n"
 "\n"
@@ -342,11 +342,11 @@ msgid ""
 "Press <space> to leave help and enter the list now.\n"
 msgstr ""
 
-#: dselect/helpmsgs.cc:80
+#: dselect/helpmsgs.cc
 msgid "Introduction to read-only package list browser"
 msgstr ""
 
-#: dselect/helpmsgs.cc:80
+#: dselect/helpmsgs.cc
 msgid ""
 "Welcome to dselect's main package listing.\n"
 "\n"
@@ -367,11 +367,11 @@ msgid ""
 "Press <space> to leave help and enter the list now.\n"
 msgstr ""
 
-#: dselect/helpmsgs.cc:99
+#: dselect/helpmsgs.cc
 msgid "Introduction to conflict/dependency resolution sub-list"
 msgstr ""
 
-#: dselect/helpmsgs.cc:99
+#: dselect/helpmsgs.cc
 msgid ""
 "Dependency/conflict resolution - introduction.\n"
 "\n"
@@ -406,11 +406,11 @@ msgid ""
 "help.\n"
 msgstr ""
 
-#: dselect/helpmsgs.cc:125
+#: dselect/helpmsgs.cc
 msgid "Display, part 1: package listing and status chars"
 msgstr ""
 
-#: dselect/helpmsgs.cc:125
+#: dselect/helpmsgs.cc
 msgid ""
 "The top half of the screen shows a list of packages.  For each package you "
 "see\n"
@@ -443,11 +443,11 @@ msgid ""
 "description.\n"
 msgstr ""
 
-#: dselect/helpmsgs.cc:152
+#: dselect/helpmsgs.cc
 msgid "Display, part 2: list highlight; information display"
 msgstr ""
 
-#: dselect/helpmsgs.cc:152
+#: dselect/helpmsgs.cc
 msgid ""
 "* Highlight: One line in the package list will be highlighted.  It "
 "indicates\n"
@@ -474,11 +474,11 @@ msgid ""
 "  information display or expand it to use almost all of the screen.\n"
 msgstr ""
 
-#: dselect/helpmsgs.cc:176
+#: dselect/helpmsgs.cc
 msgid "Introduction to method selection display"
 msgstr ""
 
-#: dselect/helpmsgs.cc:176
+#: dselect/helpmsgs.cc
 msgid ""
 "dselect and dpkg can do automatic installation, loading the package files to "
 "be\n"
@@ -502,11 +502,11 @@ msgid ""
 "menu reachable by pressing `?'.\n"
 msgstr ""
 
-#: dselect/helpmsgs.cc:196
+#: dselect/helpmsgs.cc
 msgid "Keystrokes for method selection"
 msgstr ""
 
-#: dselect/helpmsgs.cc:196
+#: dselect/helpmsgs.cc
 msgid ""
 "Motion keys: Next/Previous, Top/End, Up/Down, Backwards/Forwards:\n"
 "  j, Down-arrow         k, Up-arrow             move highlight\n"
@@ -531,206 +531,213 @@ msgid ""
 "  \\                repeat last search\n"
 msgstr ""
 
-#: dselect/main.cc:63
+#: dselect/main.cc
 msgid "Type dselect --help for help."
 msgstr ""
 
-#: dselect/main.cc:145
+#: dselect/main.cc
 msgid "a"
 msgstr ""
 
-#: dselect/main.cc:145
+#: dselect/main.cc
 msgid "[A]ccess"
 msgstr ""
 
-#: dselect/main.cc:145
+#: dselect/main.cc
 msgid "Choose the access method to use."
 msgstr ""
 
-#: dselect/main.cc:146
+#: dselect/main.cc
 msgid "u"
 msgstr ""
 
-#: dselect/main.cc:146
+#: dselect/main.cc
 msgid "[U]pdate"
 msgstr ""
 
-#: dselect/main.cc:146
+#: dselect/main.cc
 msgid "Update list of available packages, if possible."
 msgstr ""
 
-#: dselect/main.cc:147
+#: dselect/main.cc
 msgid "s"
 msgstr ""
 
-#: dselect/main.cc:147
+#: dselect/main.cc
 msgid "[S]elect"
 msgstr ""
 
-#: dselect/main.cc:147
+#: dselect/main.cc
 msgid "Request which packages you want on your system."
 msgstr ""
 
-#: dselect/main.cc:148
+#: dselect/main.cc
 msgid "i"
 msgstr ""
 
-#: dselect/main.cc:148
+#: dselect/main.cc
 msgid "[I]nstall"
 msgstr ""
 
-#: dselect/main.cc:148
+#: dselect/main.cc
 msgid "Install and upgrade wanted packages."
 msgstr ""
 
-#: dselect/main.cc:149
+#: dselect/main.cc
 msgid "c"
 msgstr ""
 
-#: dselect/main.cc:149
+#: dselect/main.cc
 msgid "[C]onfig"
 msgstr ""
 
-#: dselect/main.cc:149
+#: dselect/main.cc
 msgid "Configure any packages that are unconfigured."
 msgstr ""
 
-#: dselect/main.cc:150
+#: dselect/main.cc
 msgid "r"
 msgstr ""
 
-#: dselect/main.cc:150
+#: dselect/main.cc
 msgid "[R]emove"
 msgstr ""
 
-#: dselect/main.cc:150
+#: dselect/main.cc
 msgid "Remove unwanted software."
 msgstr ""
 
-#: dselect/main.cc:151
+#: dselect/main.cc
 msgid "q"
 msgstr ""
 
-#: dselect/main.cc:151
+#: dselect/main.cc
 msgid "[Q]uit"
 msgstr ""
 
-#: dselect/main.cc:151
+#: dselect/main.cc
 msgid "Quit dselect."
 msgstr ""
 
-#: dselect/main.cc:152
+#: dselect/main.cc
 msgid "menu"
 msgstr ""
 
-#: dselect/main.cc:157
+#: dselect/main.cc
 #, c-format
 msgid "Debian `%s' package handling frontend version %s.\n"
 msgstr ""
 
-#: dselect/main.cc:160
+#: dselect/main.cc
 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:169 dselect/main.cc:217
+#: dselect/main.cc
 msgid "<standard output>"
 msgstr ""
 
-#: dselect/main.cc:180
+#: dselect/main.cc
 #, c-format
 msgid ""
-"Usage: %s [<option> ...] [<action> ...]\n"
+"Usage: %s [<option>...] [<command>...]\n"
 "\n"
 msgstr ""
 
-#: dselect/main.cc:184
+#: dselect/main.cc
+#, c-format
+msgid "Commands:\n"
+msgstr ""
+
+#: dselect/main.cc
 #, c-format
 msgid ""
 "Options:\n"
-"  --admindir <directory>     Use <directory> instead of %s.\n"
-"  --expert                   Turn on expert mode.\n"
-"  --debug <file> | -D<file>  Turn on debugging, sending output to <file>.\n"
-"  --colour | --color screenpart:[foreground],[background][:attr[+attr+...]]\n"
-"                             Configure screen colours.\n"
-"\n"
+"      --admindir <directory>       Use <directory> instead of %s.\n"
+"      --expert                     Turn on expert mode.\n"
+"  -D, --debug <file>               Turn on debugging, send output to "
+"<file>.\n"
+"      --color <color-spec>         Configure screen colors.\n"
+"      --colour <color-spec>        Ditto.\n"
 msgstr ""
 
-#: dselect/main.cc:193
+#: dselect/main.cc
 #, c-format
 msgid ""
-"  --help                     Show this help message.\n"
-"  --version                  Show the version.\n"
+"  -?, --help                       Show this help message.\n"
+"      --version                    Show the version.\n"
 "\n"
 msgstr ""
 
-#: dselect/main.cc:197
+#: dselect/main.cc
 #, c-format
-msgid "Actions:\n"
+msgid ""
+"<color-spec> is <screen-part>:[<foreground>],[<background>][:"
+"<attr>[+<attr>]...]\n"
 msgstr ""
 
-#: dselect/main.cc:202
+#: dselect/main.cc
 #, c-format
-msgid "Screenparts:\n"
+msgid "<screen-part> is:"
 msgstr ""
 
-#: dselect/main.cc:207
+#: dselect/main.cc
 #, c-format
-msgid "Colours:\n"
+msgid "<color> is:"
 msgstr ""
 
-#: dselect/main.cc:212
+#: dselect/main.cc
 #, c-format
-msgid "Attributes:\n"
+msgid "<attr> is:"
 msgstr ""
 
-#: dselect/main.cc:232
+#: dselect/main.cc
 #, c-format
 msgid "couldn't open debug file `%.255s'\n"
 msgstr ""
 
-#: dselect/main.cc:253
+#: dselect/main.cc
 #, c-format
 msgid "invalid %s '%s'"
 msgstr ""
 
-#: dselect/main.cc:272
+#: dselect/main.cc
 msgid "screen part"
 msgstr ""
 
-#: dselect/main.cc:278
+#: dselect/main.cc
 msgid "null colour specification"
 msgstr ""
 
-#: dselect/main.cc:286 dselect/main.cc:291
+#: dselect/main.cc
 msgid "colour"
 msgstr ""
 
-#: dselect/main.cc:299
+#: dselect/main.cc
 msgid "colour attribute"
 msgstr ""
 
-#: dselect/main.cc:333
+#: dselect/main.cc
 msgid "Terminal does not appear to support cursor addressing.\n"
 msgstr ""
 
-#: dselect/main.cc:335
+#: dselect/main.cc
 msgid "Terminal does not appear to support highlighting.\n"
 msgstr ""
 
-#: dselect/main.cc:337
+#: dselect/main.cc
 #, 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:340
+#: dselect/main.cc
 msgid "terminal lacks necessary features, giving up"
 msgstr ""
 
-#: dselect/main.cc:425
+#: dselect/main.cc
 msgid ""
 "\n"
 "\n"
@@ -739,70 +746,70 @@ msgid ""
 "\n"
 msgstr ""
 
-#: dselect/main.cc:430
+#: dselect/main.cc
 msgid ""
 "Copyright (C) 1994-1996 Ian Jackson.\n"
 "Copyright (C) 2000,2001 Wichert Akkerman.\n"
 msgstr ""
 
-#: dselect/main.cc:436
+#: dselect/main.cc
 msgid ""
 "\n"
 "\n"
 "Read-only access: only preview of selections is available!"
 msgstr ""
 
-#: dselect/main.cc:455
+#: dselect/main.cc
 msgid "failed to getch in main menu"
 msgstr ""
 
-#: dselect/main.cc:538
+#: dselect/main.cc
 #, c-format
 msgid "unknown action string `%.50s'"
 msgstr ""
 
-#: dselect/methlist.cc:66
+#: dselect/methlist.cc
 msgid "Abbrev."
 msgstr ""
 
-#: dselect/methlist.cc:67 dselect/pkgdisplay.cc:188 dselect/pkginfo.cc:110
+#: dselect/methlist.cc dselect/pkgdisplay.cc dselect/pkginfo.cc
 msgid "Description"
 msgstr ""
 
-#: dselect/methlist.cc:73
+#: dselect/methlist.cc
 msgid "dselect - list of access methods"
 msgstr ""
 
-#: dselect/methlist.cc:82
+#: dselect/methlist.cc
 #, c-format
 msgid "Access method `%s'."
 msgstr ""
 
-#: dselect/methlist.cc:161 dselect/pkglist.cc:587
+#: dselect/methlist.cc dselect/pkglist.cc
 msgid "doupdate failed"
 msgstr ""
 
-#: dselect/methlist.cc:164 dselect/pkglist.cc:590
+#: dselect/methlist.cc dselect/pkglist.cc
 msgid "failed to unblock SIGWINCH"
 msgstr ""
 
-#: dselect/methlist.cc:169 dselect/pkglist.cc:595
+#: dselect/methlist.cc dselect/pkglist.cc
 msgid "failed to re-block SIGWINCH"
 msgstr ""
 
-#: dselect/methlist.cc:170 dselect/pkglist.cc:597
+#: dselect/methlist.cc dselect/pkglist.cc
 msgid "getch failed"
 msgstr ""
 
-#: dselect/methlist.cc:187
+#: dselect/methlist.cc
 msgid "Explanation"
 msgstr ""
 
-#: dselect/methlist.cc:197
+#: dselect/methlist.cc
 msgid "No explanation available."
 msgstr ""
 
-#: dselect/method.cc:67
+#: dselect/method.cc
 #, c-format
 msgid ""
 "\n"
@@ -810,191 +817,191 @@ msgid ""
 "%s: %s\n"
 msgstr ""
 
-#: dselect/method.cc:70
+#: dselect/method.cc
 msgid ""
 "\n"
 "Press <enter> to continue."
 msgstr ""
 
-#: dselect/method.cc:82
+#: dselect/method.cc
 msgid "cannot unlock access method area"
 msgstr ""
 
-#: dselect/method.cc:96
+#: dselect/method.cc
 msgid "no access methods are available"
 msgstr ""
 
-#: dselect/method.cc:115
+#: dselect/method.cc
 msgid "requested operation requires superuser privilege"
 msgstr ""
 
-#: dselect/method.cc:118
+#: dselect/method.cc
 msgid "cannot open or create access method lockfile"
 msgstr ""
 
-#: dselect/method.cc:125
+#: dselect/method.cc
 msgid "the access method area is already locked"
 msgstr ""
 
-#: dselect/method.cc:128
+#: dselect/method.cc
 msgid "cannot lock access method area"
 msgstr ""
 
-#: dselect/method.cc:161
+#: dselect/method.cc
 #, c-format
 msgid "Press <enter> to continue.\n"
 msgstr ""
 
-#: dselect/method.cc:162
+#: dselect/method.cc
 msgid "<standard error>"
 msgstr ""
 
-#: dselect/method.cc:165
+#: dselect/method.cc
 msgid "error reading acknowledgement of program failure message"
 msgstr ""
 
-#: dselect/method.cc:187
+#: dselect/method.cc
 msgid "no access method is selected or configured"
 msgstr ""
 
-#: dselect/method.cc:196
+#: dselect/method.cc
 msgid "update available list script"
 msgstr ""
 
-#: dselect/method.cc:200
+#: dselect/method.cc
 msgid "installation script"
 msgstr ""
 
-#: dselect/method.cc:246
+#: dselect/method.cc
 msgid "query/setup script"
 msgstr ""
 
-#: dselect/methparse.cc:53
+#: dselect/methparse.cc
 #, c-format
 msgid "syntax error in method options file `%.250s' -- %s"
 msgstr ""
 
-#: dselect/methparse.cc:59
+#: dselect/methparse.cc
 #, c-format
 msgid "error reading options file `%.250s'"
 msgstr ""
 
-#: dselect/methparse.cc:93
+#: dselect/methparse.cc
 #, c-format
 msgid "unable to read `%.250s' directory for reading methods"
 msgstr ""
 
-#: dselect/methparse.cc:109
+#: dselect/methparse.cc
 #, c-format
 msgid "method `%.250s' has name that is too long (%d > %d characters)"
 msgstr ""
 
-#: dselect/methparse.cc:120
+#: dselect/methparse.cc
 #, c-format
 msgid "unable to access method script `%.250s'"
 msgstr ""
 
-#: dselect/methparse.cc:126
+#: dselect/methparse.cc
 #, c-format
 msgid "unable to read method options file `%.250s'"
 msgstr ""
 
-#: dselect/methparse.cc:150
+#: dselect/methparse.cc
 msgid "non-digit where digit wanted"
 msgstr ""
 
-#: dselect/methparse.cc:153
-msgid "EOF in index string"
+#: dselect/methparse.cc
+msgid "end of file in index string"
 msgstr ""
 
-#: dselect/methparse.cc:156
+#: dselect/methparse.cc
 msgid "index string too long"
 msgstr ""
 
-#: dselect/methparse.cc:159
+#: dselect/methparse.cc
 msgid "newline before option name start"
 msgstr ""
 
-#: dselect/methparse.cc:161
-msgid "EOF before option name start"
+#: dselect/methparse.cc
+msgid "end of file before option name start"
 msgstr ""
 
-#: dselect/methparse.cc:165
+#: dselect/methparse.cc
 msgid "nonalpha where option name start wanted"
 msgstr ""
 
-#: dselect/methparse.cc:167
+#: dselect/methparse.cc
 msgid "non-alphanum in option name"
 msgstr ""
 
-#: dselect/methparse.cc:170
-msgid "EOF in option name"
+#: dselect/methparse.cc
+msgid "end of file in option name"
 msgstr ""
 
-#: dselect/methparse.cc:175
+#: dselect/methparse.cc
 msgid "newline before summary"
 msgstr ""
 
-#: dselect/methparse.cc:177
-msgid "EOF before summary"
+#: dselect/methparse.cc
+msgid "end of file before summary"
 msgstr ""
 
-#: dselect/methparse.cc:183
-msgid "EOF in summary - missing newline"
+#: dselect/methparse.cc
+msgid "end of file in summary - missing newline"
 msgstr ""
 
-#: dselect/methparse.cc:193
+#: dselect/methparse.cc
 #, c-format
 msgid "unable to open option description file `%.250s'"
 msgstr ""
 
-#: dselect/methparse.cc:197
+#: dselect/methparse.cc
 #, c-format
 msgid "unable to stat option description file `%.250s'"
 msgstr ""
 
-#: dselect/methparse.cc:201
+#: dselect/methparse.cc
 #, c-format
 msgid "failed to read option description file `%.250s'"
 msgstr ""
 
-#: dselect/methparse.cc:204
+#: dselect/methparse.cc
 #, c-format
 msgid "error during read of option description file `%.250s'"
 msgstr ""
 
-#: dselect/methparse.cc:227
+#: dselect/methparse.cc
 #, c-format
 msgid "error during read of method options file `%.250s'"
 msgstr ""
 
-#: dselect/methparse.cc:250
+#: dselect/methparse.cc
 #, c-format
 msgid "unable to open current option file `%.250s'"
 msgstr ""
 
-#: dselect/methparse.cc:286
+#: dselect/methparse.cc
 #, c-format
 msgid "unable to write new option to `%.250s'"
 msgstr ""
 
-#: dselect/pkgdisplay.cc:36
+#: dselect/pkgdisplay.cc
 msgid "new package"
 msgstr ""
 
-#: dselect/pkgdisplay.cc:37
+#: dselect/pkgdisplay.cc
 msgid "install"
 msgstr ""
 
-#: dselect/pkgdisplay.cc:38
+#: dselect/pkgdisplay.cc
 msgid "hold"
 msgstr ""
 
-#: dselect/pkgdisplay.cc:39
+#: dselect/pkgdisplay.cc
 msgid "remove"
 msgstr ""
 
-#: dselect/pkgdisplay.cc:40
+#: dselect/pkgdisplay.cc
 msgid "purge"
 msgstr ""
 
@@ -1002,327 +1009,315 @@ msgstr ""
 #. * the empty string to store information about the translation. DO NOT
 #. * CHANGE THAT IN A TRANSLATION! The code really relies on that being
 #. * a single space.
-#: dselect/pkgdisplay.cc:47
+#: dselect/pkgdisplay.cc
 msgid " "
 msgstr ""
 
-#: dselect/pkgdisplay.cc:48
+#: dselect/pkgdisplay.cc
 msgid "REINSTALL"
 msgstr ""
 
-#: dselect/pkgdisplay.cc:51
+#: dselect/pkgdisplay.cc
 msgid "not installed"
 msgstr ""
 
-#: dselect/pkgdisplay.cc:52
+#: dselect/pkgdisplay.cc
 msgid "removed (configs remain)"
 msgstr ""
 
-#: dselect/pkgdisplay.cc:53
+#: dselect/pkgdisplay.cc
 msgid "half installed"
 msgstr ""
 
-#: dselect/pkgdisplay.cc:54
+#: dselect/pkgdisplay.cc
 msgid "unpacked (not set up)"
 msgstr ""
 
-#: dselect/pkgdisplay.cc:55
+#: dselect/pkgdisplay.cc
 msgid "half configured (config failed)"
 msgstr ""
 
-#: dselect/pkgdisplay.cc:56
+#: dselect/pkgdisplay.cc
 msgid "awaiting trigger processing"
 msgstr ""
 
-#: dselect/pkgdisplay.cc:57
+#: dselect/pkgdisplay.cc
 msgid "triggered"
 msgstr ""
 
-#: dselect/pkgdisplay.cc:58
+#: dselect/pkgdisplay.cc
 msgid "installed"
 msgstr ""
 
-#: dselect/pkgdisplay.cc:61
+#: dselect/pkgdisplay.cc
 msgid "Required"
 msgstr ""
 
-#: dselect/pkgdisplay.cc:62
+#: dselect/pkgdisplay.cc
 msgid "Important"
 msgstr ""
 
-#: dselect/pkgdisplay.cc:63
+#: dselect/pkgdisplay.cc
 msgid "Standard"
 msgstr ""
 
-#: dselect/pkgdisplay.cc:64
+#: dselect/pkgdisplay.cc
 msgid "Optional"
 msgstr ""
 
-#: dselect/pkgdisplay.cc:65
+#: dselect/pkgdisplay.cc
 msgid "Extra"
 msgstr ""
 
-#: dselect/pkgdisplay.cc:66
-msgid "!Bug!"
-msgstr ""
-
-#: dselect/pkgdisplay.cc:67
+#: dselect/pkgdisplay.cc
 msgid "Unclassified"
 msgstr ""
 
-#: dselect/pkgdisplay.cc:70
+#: dselect/pkgdisplay.cc
 msgid "suggests"
 msgstr ""
 
-#: dselect/pkgdisplay.cc:71
+#: dselect/pkgdisplay.cc
 msgid "recommends"
 msgstr ""
 
-#: dselect/pkgdisplay.cc:72
+#: dselect/pkgdisplay.cc
 msgid "depends on"
 msgstr ""
 
-#: dselect/pkgdisplay.cc:73
+#: dselect/pkgdisplay.cc
 msgid "pre-depends on"
 msgstr ""
 
-#: dselect/pkgdisplay.cc:74
+#: dselect/pkgdisplay.cc
 msgid "breaks"
 msgstr ""
 
-#: dselect/pkgdisplay.cc:75
+#: dselect/pkgdisplay.cc
 msgid "conflicts with"
 msgstr ""
 
-#: dselect/pkgdisplay.cc:76
+#: dselect/pkgdisplay.cc
 msgid "provides"
 msgstr ""
 
-#: dselect/pkgdisplay.cc:77
+#: dselect/pkgdisplay.cc
 msgid "replaces"
 msgstr ""
 
-#: dselect/pkgdisplay.cc:78
+#: dselect/pkgdisplay.cc
 msgid "enhances"
 msgstr ""
 
-#: dselect/pkgdisplay.cc:81
+#: dselect/pkgdisplay.cc
 msgid "Req"
 msgstr ""
 
-#: dselect/pkgdisplay.cc:82
+#: dselect/pkgdisplay.cc
 msgid "Imp"
 msgstr ""
 
-#: dselect/pkgdisplay.cc:83
+#: dselect/pkgdisplay.cc
 msgid "Std"
 msgstr ""
 
-#: dselect/pkgdisplay.cc:84
+#: dselect/pkgdisplay.cc
 msgid "Opt"
 msgstr ""
 
-#: dselect/pkgdisplay.cc:85
+#: dselect/pkgdisplay.cc
 msgid "Xtr"
 msgstr ""
 
-#: dselect/pkgdisplay.cc:86
+#: dselect/pkgdisplay.cc
 msgid "bUG"
 msgstr ""
 
-#: dselect/pkgdisplay.cc:87
+#: dselect/pkgdisplay.cc
 msgid "?"
 msgstr ""
 
-#: dselect/pkgdisplay.cc:95 dselect/pkgdisplay.cc:115
+#: dselect/pkgdisplay.cc
 msgid "Broken"
 msgstr ""
 
-#: dselect/pkgdisplay.cc:96
+#: dselect/pkgdisplay.cc
 msgid "New"
 msgstr ""
 
-#: dselect/pkgdisplay.cc:97
-msgid "Updated"
+#: dselect/pkgdisplay.cc
+msgid "Upgradable"
 msgstr ""
 
-#: dselect/pkgdisplay.cc:98
+#: dselect/pkgdisplay.cc
 msgid "Obsolete/local"
 msgstr ""
 
-#: dselect/pkgdisplay.cc:99
-msgid "Up-to-date"
+#: dselect/pkgdisplay.cc
+msgid "Installed"
 msgstr ""
 
-#: dselect/pkgdisplay.cc:100
+#: dselect/pkgdisplay.cc
 msgid "Available"
 msgstr ""
 
-#: dselect/pkgdisplay.cc:101 dselect/pkgdisplay.cc:117
+#: dselect/pkgdisplay.cc
 msgid "Removed"
 msgstr ""
 
-#: dselect/pkgdisplay.cc:102 dselect/pkgdisplay.cc:111
+#: dselect/pkgdisplay.cc
 msgid "Brokenly installed packages"
 msgstr ""
 
-#: dselect/pkgdisplay.cc:103
+#: dselect/pkgdisplay.cc
 msgid "Newly available packages"
 msgstr ""
 
-#: dselect/pkgdisplay.cc:104
-msgid "Updated packages (newer version is available)"
+#: dselect/pkgdisplay.cc
+msgid "Upgradable packages"
 msgstr ""
 
-#: dselect/pkgdisplay.cc:105
-msgid "Obsolete and local packages present on system"
+#: dselect/pkgdisplay.cc
+msgid "Obsolete and locally created packages"
 msgstr ""
 
-#: dselect/pkgdisplay.cc:106
-msgid "Up to date installed packages"
+#: dselect/pkgdisplay.cc
+msgid "Installed packages"
 msgstr ""
 
-#: dselect/pkgdisplay.cc:107
-msgid "Available packages (not currently installed)"
+#: dselect/pkgdisplay.cc
+msgid "Available not installed packages"
 msgstr ""
 
-#: dselect/pkgdisplay.cc:108
+#: dselect/pkgdisplay.cc
 msgid "Removed and no longer available packages"
 msgstr ""
 
-#: dselect/pkgdisplay.cc:112
-msgid "Installed packages"
-msgstr ""
-
-#: dselect/pkgdisplay.cc:113
+#: dselect/pkgdisplay.cc
 msgid "Removed packages (configuration still present)"
 msgstr ""
 
-#: dselect/pkgdisplay.cc:114
+#: dselect/pkgdisplay.cc
 msgid "Purged packages and those never installed"
 msgstr ""
 
-#: dselect/pkgdisplay.cc:116
-msgid "Installed"
-msgstr ""
-
-#: dselect/pkgdisplay.cc:118
+#: dselect/pkgdisplay.cc
 msgid "Purged"
 msgstr ""
 
-#: dselect/pkgdisplay.cc:138
+#: dselect/pkgdisplay.cc
 msgid "Error"
 msgstr ""
 
-#: dselect/pkgdisplay.cc:139
+#: dselect/pkgdisplay.cc
 msgid "Installed?"
 msgstr ""
 
-#: dselect/pkgdisplay.cc:140
+#: dselect/pkgdisplay.cc
 msgid "Old mark"
 msgstr ""
 
-#: dselect/pkgdisplay.cc:141
+#: dselect/pkgdisplay.cc
 msgid "Marked for"
 msgstr ""
 
-#: dselect/pkgdisplay.cc:143
+#: dselect/pkgdisplay.cc
 msgid "EIOM"
 msgstr ""
 
-#: dselect/pkgdisplay.cc:147 dselect/pkgdisplay.cc:150
+#: dselect/pkgdisplay.cc
 msgid "Section"
 msgstr ""
 
-#: dselect/pkgdisplay.cc:148
+#: dselect/pkgdisplay.cc
 msgid "Priority"
 msgstr ""
 
-#: dselect/pkgdisplay.cc:152
+#: dselect/pkgdisplay.cc
 msgid "Package"
 msgstr ""
 
-#: dselect/pkgdisplay.cc:161 dselect/pkgdisplay.cc:165
+#: dselect/pkgdisplay.cc
 msgid "Avail.arch"
 msgstr ""
 
-#: dselect/pkgdisplay.cc:164
+#: dselect/pkgdisplay.cc
 msgid "Inst.arch"
 msgstr ""
 
-#: dselect/pkgdisplay.cc:178 dselect/pkgdisplay.cc:182
+#: dselect/pkgdisplay.cc
 msgid "Avail.ver"
 msgstr ""
 
-#: dselect/pkgdisplay.cc:181
+#: dselect/pkgdisplay.cc
 msgid "Inst.ver"
 msgstr ""
 
-#: dselect/pkgdisplay.cc:197
+#: dselect/pkgdisplay.cc
 msgid "dselect - recursive package listing"
 msgstr ""
 
-#: dselect/pkgdisplay.cc:199
+#: dselect/pkgdisplay.cc
 msgid "dselect - inspection of package states"
 msgstr ""
 
-#: dselect/pkgdisplay.cc:200
+#: dselect/pkgdisplay.cc
 msgid "dselect - main package listing"
 msgstr ""
 
-#: dselect/pkgdisplay.cc:208
+#: dselect/pkgdisplay.cc
 msgid " (by section)"
 msgstr ""
 
-#: dselect/pkgdisplay.cc:211
+#: dselect/pkgdisplay.cc
 msgid " (avail., section)"
 msgstr ""
 
-#: dselect/pkgdisplay.cc:214
+#: dselect/pkgdisplay.cc
 msgid " (status, section)"
 msgstr ""
 
-#: dselect/pkgdisplay.cc:223
+#: dselect/pkgdisplay.cc
 msgid " (by priority)"
 msgstr ""
 
-#: dselect/pkgdisplay.cc:226
+#: dselect/pkgdisplay.cc
 msgid " (avail., priority)"
 msgstr ""
 
-#: dselect/pkgdisplay.cc:229
+#: dselect/pkgdisplay.cc
 msgid " (status, priority)"
 msgstr ""
 
-#: dselect/pkgdisplay.cc:238
+#: dselect/pkgdisplay.cc
 msgid " (alphabetically)"
 msgstr ""
 
-#: dselect/pkgdisplay.cc:241
+#: dselect/pkgdisplay.cc
 msgid " (by availability)"
 msgstr ""
 
-#: dselect/pkgdisplay.cc:244
+#: dselect/pkgdisplay.cc
 msgid " (by status)"
 msgstr ""
 
-#: dselect/pkgdisplay.cc:259
+#: dselect/pkgdisplay.cc
 msgid " mark:+/=/- terse:v help:?"
 msgstr ""
 
-#: dselect/pkgdisplay.cc:260
+#: dselect/pkgdisplay.cc
 msgid " mark:+/=/- verbose:v help:?"
 msgstr ""
 
-#: dselect/pkgdisplay.cc:262
+#: dselect/pkgdisplay.cc
 msgid " terse:v help:?"
 msgstr ""
 
-#: dselect/pkgdisplay.cc:263
+#: dselect/pkgdisplay.cc
 msgid " verbose:v help:?"
 msgstr ""
 
-#: dselect/pkginfo.cc:85
+#: dselect/pkginfo.cc
 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 "
@@ -1334,76 +1329,76 @@ msgid ""
 "opportunity to mark packages in different kinds of groups."
 msgstr ""
 
-#: dselect/pkginfo.cc:98
+#: dselect/pkginfo.cc
 msgid "Interrelationships"
 msgstr ""
 
-#: dselect/pkginfo.cc:117
+#: dselect/pkginfo.cc
 msgid "No description available."
 msgstr ""
 
-#: dselect/pkginfo.cc:135
+#: dselect/pkginfo.cc
 msgid "Installed control file information"
 msgstr ""
 
-#: dselect/pkginfo.cc:151
+#: dselect/pkginfo.cc
 msgid "Available control file information"
 msgstr ""
 
-#: dselect/pkglist.cc:425
+#: dselect/pkglist.cc
 msgid "there are no packages"
 msgstr ""
 
-#: dselect/pkglist.cc:521
+#: dselect/pkglist.cc
 msgid "invalid search option given"
 msgstr ""
 
-#: dselect/pkglist.cc:536
+#: dselect/pkglist.cc
 msgid "error in regular expression"
 msgstr ""
 
-#: dselect/pkgsublist.cc:111
+#: dselect/pkgsublist.cc
 msgid " does not appear to be available\n"
 msgstr ""
 
-#: dselect/pkgsublist.cc:131
+#: dselect/pkgsublist.cc
 msgid " or "
 msgstr ""
 
-#: dselect/pkgtop.cc:58
+#: dselect/pkgtop.cc
 msgid "All"
 msgstr ""
 
-#: dselect/pkgtop.cc:80
+#: dselect/pkgtop.cc
 msgid "All packages"
 msgstr ""
 
-#: dselect/pkgtop.cc:84
+#: dselect/pkgtop.cc
 #, c-format
 msgid "%s packages without a section"
 msgstr ""
 
-#: dselect/pkgtop.cc:86
+#: dselect/pkgtop.cc
 #, c-format
 msgid "%s packages in section %s"
 msgstr ""
 
-#: dselect/pkgtop.cc:92
+#: dselect/pkgtop.cc
 #, c-format
 msgid "%s %s packages"
 msgstr ""
 
-#: dselect/pkgtop.cc:96
+#: dselect/pkgtop.cc
 #, c-format
 msgid "%s %s packages without a section"
 msgstr ""
 
-#: dselect/pkgtop.cc:98
+#: dselect/pkgtop.cc
 #, c-format
 msgid "%s %s packages in section %s"
 msgstr ""
 
-#: dselect/pkgtop.cc:119
+#: dselect/pkgtop.cc
 #, c-format
 msgid "%-*s %s%s%s;  %s (was: %s).  %s"
 msgstr ""
diff --git a/dselect/po/el.po b/dselect/po/el.po
index 1e290f3ed..9723429a9 100644
--- a/dselect/po/el.po
+++ b/dselect/po/el.po
@@ -13,7 +13,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dselect 1.17.0\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2014-12-23 18:12+0100\n"
+"POT-Creation-Date: 2015-04-06 09:37+0200\n"
 "PO-Revision-Date: 2006-02-17 08:56+0200\n"
 "Last-Translator: quad-nrg.net <galaxico@quad-nrg.net>\n"
 "Language-Team: Greek <debian-l10n-greek@lists.debian.org>\n"
@@ -24,27 +24,27 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: KBabel 1.10.2\n"
 
-#: dselect/basecmds.cc:125
+#: dselect/basecmds.cc
 msgid "Search for ? "
 msgstr "Αναζήτηση για;"
 
-#: dselect/basecmds.cc:149
+#: dselect/basecmds.cc
 msgid "Error: "
 msgstr "Σφάλμα:"
 
-#: dselect/basecmds.cc:180
+#: dselect/basecmds.cc
 msgid "Help: "
 msgstr "Βοήθεια: "
 
-#: dselect/basecmds.cc:186
+#: dselect/basecmds.cc
 msgid "Press ? for help menu, . for next topic, <space> to exit help."
 msgstr "Πατήστε ? για μενού βοηθείας, <space> για επόμενο θέμα."
 
-#: dselect/basecmds.cc:193
+#: dselect/basecmds.cc
 msgid "Help information is available under the following topics:"
 msgstr "Πληροφορίες βοήθειας είναι διαθέσιμες για τα ακόλουθα θέματα:"
 
-#: dselect/basecmds.cc:201
+#: dselect/basecmds.cc
 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. "
@@ -52,243 +52,243 @@ msgstr ""
 "Πιέστε ένα πλήκτρο από την λίστα, <space> ή `q' για έξοδο από τη βοήθεια,\n"
 "  η '.' (τελεία) για να διαβάσετε κάθε σελίδα με τη σειρά. "
 
-#: dselect/basecmds.cc:207
+#: dselect/basecmds.cc
 msgid "error reading keyboard in help"
 msgstr "σφάλμα εισόδου από το πληκτρολόγιο στη βοήθεια"
 
-#: dselect/baselist.cc:60
+#: dselect/baselist.cc
 msgid "ioctl(TIOCGWINSZ) failed"
 msgstr "η ioctl(TIOCGWINSZ) απέτυχε"
 
-#: dselect/baselist.cc:63
+#: dselect/baselist.cc
 msgid "doupdate in SIGWINCH handler failed"
 msgstr "η doupdate στον ελεγκτή SIGWINCH απέτυχε"
 
-#: dselect/baselist.cc:72
+#: dselect/baselist.cc
 msgid "failed to restore old SIGWINCH sigact"
 msgstr "απέτυχε η επαναφορά του παλιού SIGWINCH sigact"
 
-#: dselect/baselist.cc:75
+#: dselect/baselist.cc
 msgid "failed to restore old signal mask"
 msgstr "απέτυχε η επαναφορά της παλιάς μάσκας σημάτων"
 
-#: dselect/baselist.cc:86
+#: dselect/baselist.cc
 msgid "failed to get old signal mask"
 msgstr "απέτυχε η λήψη της παλιάς μάσκας σημάτων"
 
-#: dselect/baselist.cc:88
+#: dselect/baselist.cc
 msgid "failed to get old SIGWINCH sigact"
 msgstr "απέτυχε η λήψη του παλιού SIGWINCH sigact"
 
-#: dselect/baselist.cc:93
+#: dselect/baselist.cc
 msgid "failed to block SIGWINCH"
 msgstr "απέτυχε ο αποκλεισμός του SIGWINCH"
 
-#: dselect/baselist.cc:99
+#: dselect/baselist.cc
 msgid "failed to set new SIGWINCH sigact"
 msgstr "απέτυχε ο ορισμός νέου SIGWINCH sigact"
 
-#: dselect/baselist.cc:174
+#: dselect/baselist.cc
 msgid "failed to allocate colour pair"
 msgstr "απέτυχε η δέσμευση ζεύγους χρωμάτων"
 
-#: dselect/baselist.cc:203
+#: dselect/baselist.cc
 msgid "failed to create title window"
 msgstr "απέτυχε η δημιουργία παραθύρου τίτλου"
 
-#: dselect/baselist.cc:207
+#: dselect/baselist.cc
 msgid "failed to create whatinfo window"
 msgstr "απέτυχε η δημιουργία παραθύρου whatinfo"
 
-#: dselect/baselist.cc:211
+#: dselect/baselist.cc
 msgid "failed to create baselist pad"
 msgstr "απέτυχε η δημιουργία επιφάνειας βασικής λίστας"
 
-#: dselect/baselist.cc:214
+#: dselect/baselist.cc
 msgid "failed to create heading pad"
 msgstr "απέτυχε η δημιουργία επιφάνειας πλοήγησης"
 
-#: dselect/baselist.cc:218
+#: dselect/baselist.cc
 msgid "failed to create thisstate pad"
 msgstr "απέτυχε η δημιουργία επιφάνειας thisstate"
 
-#: dselect/baselist.cc:222
+#: dselect/baselist.cc
 msgid "failed to create info pad"
 msgstr "απέτυχε η δημιουργία επιφάνειας πληροφοριών"
 
-#: dselect/baselist.cc:227
+#: dselect/baselist.cc
 msgid "failed to create query window"
 msgstr "απέτυχε η δημιουργία παραθύρου ερωτήσεων"
 
-#: dselect/baselist.cc:298
+#: dselect/baselist.cc
 #, fuzzy
 msgid "Keybindings"
 msgstr "συνδυασμοί πλήκτρων"
 
-#: dselect/baselist.cc:347
+#: dselect/baselist.cc
 #, c-format
 msgid "  -- %d%%, press "
 msgstr "  -- %d%%, πατήστε "
 
-#: dselect/baselist.cc:350
+#: dselect/baselist.cc
 #, c-format
 msgid "%s for more"
 msgstr "%s για περισσότερα"
 
-#: dselect/baselist.cc:354
+#: dselect/baselist.cc
 #, c-format
 msgid "%s to go back"
 msgstr "%s για επιστροφή"
 
-#: dselect/bindings.cc:78
+#: dselect/bindings.cc
 msgid "[not bound]"
 msgstr "[χωρίς δεσμό]"
 
-#: dselect/bindings.cc:82
+#: dselect/bindings.cc
 #, c-format
 msgid "[unk: %d]"
 msgstr "[unk: %d]"
 
-#: dselect/bindings.cc:141
+#: dselect/bindings.cc
 msgid "Scroll onwards through help/information"
 msgstr "μετακινηθείτε εμπρός στη βοήθεια/πληροφορίες"
 
-#: dselect/bindings.cc:142
+#: dselect/bindings.cc
 msgid "Scroll backwards through help/information"
 msgstr "μετακινηθείτε πίσω στη βοήθεια/πληροφορίες"
 
-#: dselect/bindings.cc:143
+#: dselect/bindings.cc
 msgid "Move up"
 msgstr "Μετακίνηση επάνω"
 
-#: dselect/bindings.cc:144
+#: dselect/bindings.cc
 msgid "Move down"
 msgstr "Μετακίνηση κάτω"
 
-#: dselect/bindings.cc:145
+#: dselect/bindings.cc
 msgid "Go to top of list"
 msgstr "Μετάβαση στην αρχή της λίστας"
 
-#: dselect/bindings.cc:146
+#: dselect/bindings.cc
 msgid "Go to end of list"
 msgstr "Μετάβαση στο τέλος της λίστας"
 
-#: dselect/bindings.cc:147
+#: dselect/bindings.cc
 msgid "Request help (cycle through help screens)"
 msgstr "Αίτηση βοηθείας (εναλλαγή οθονών βοηθείας)"
 
-#: dselect/bindings.cc:148
+#: dselect/bindings.cc
 msgid "Cycle through information displays"
 msgstr "Εναλλαγή οθονών πληροφοριών"
 
-#: dselect/bindings.cc:149
+#: dselect/bindings.cc
 msgid "Redraw display"
 msgstr "Επανασχεδιασμός οθόνης"
 
-#: dselect/bindings.cc:150
+#: dselect/bindings.cc
 msgid "Scroll onwards through list by 1 line"
 msgstr "Μετακίνηση εμπρός στη λίστα κατά μια γραμμή"
 
-#: dselect/bindings.cc:151
+#: dselect/bindings.cc
 msgid "Scroll backwards through list by 1 line"
 msgstr "Μετακίνηση πίσω στη λίστα κατά μια γραμμή"
 
-#: dselect/bindings.cc:152
+#: dselect/bindings.cc
 msgid "Scroll onwards through help/information by 1 line"
 msgstr "Μετακίνηση εμπρός στη βοήθεια/πληροφορίες κατά μια γραμμή"
 
-#: dselect/bindings.cc:153
+#: dselect/bindings.cc
 msgid "Scroll backwards through help/information by 1 line"
 msgstr "Μετακίνηση πίσω στη βοήθεια/πληροφορίες κατά μια γραμμή"
 
-#: dselect/bindings.cc:154
+#: dselect/bindings.cc
 msgid "Scroll onwards through list"
 msgstr "Μετακίνηση εμπρός στη λίστα"
 
-#: dselect/bindings.cc:155
+#: dselect/bindings.cc
 msgid "Scroll backwards through list"
 msgstr "Μετακίνηση πίσω στη λίστα"
 
-#: dselect/bindings.cc:158
+#: dselect/bindings.cc
 msgid "Mark package(s) for installation"
 msgstr "Μαρκάρισμα πακέτου(ων) για εγκατάσταση"
 
-#: dselect/bindings.cc:159
+#: dselect/bindings.cc
 msgid "Mark package(s) for deinstallation"
 msgstr "Μαρκάρισμα πακέτου(ων) για απεγκατάσταση"
 
-#: dselect/bindings.cc:160
+#: dselect/bindings.cc
 msgid "Mark package(s) for deinstall and purge"
 msgstr "Μαρκάρισμα πακέτου(ων) για απεγκατάσταση και διαγραφή"
 
-#: dselect/bindings.cc:161
+#: dselect/bindings.cc
 msgid "Make highlight more specific"
 msgstr "Πιο συγκεκριμένος τονισμός"
 
-#: dselect/bindings.cc:162
+#: dselect/bindings.cc
 msgid "Make highlight less specific"
 msgstr "Λιγότερο συγκεκριμένος τονισμός"
 
-#: dselect/bindings.cc:163
+#: dselect/bindings.cc
 msgid "Search for a package whose name contains a string"
 msgstr "αναζήτηση πακέτου με βάση το όνομα"
 
-#: dselect/bindings.cc:164
+#: dselect/bindings.cc
 #, fuzzy
 #| msgid "Repeat last search."
 msgid "Repeat last search"
 msgstr "επανάληψη προηγούμενης αναζήτησης."
 
-#: dselect/bindings.cc:165
+#: dselect/bindings.cc
 msgid "Swap sort order priority/section"
 msgstr "Αντιστροφή σειράς ταξινόμησης προτεραιότητας/τομέα"
 
-#: dselect/bindings.cc:166
+#: dselect/bindings.cc
 msgid "Quit, confirming, and checking dependencies"
 msgstr "Έξοδος, επιβεβαίωση, και έλεγχος εξαρτήσεων"
 
-#: dselect/bindings.cc:167
+#: dselect/bindings.cc
 msgid "Quit, confirming without check"
 msgstr "Έξοδος, επιβεβαίωση χωρίς έλεγχο"
 
-#: dselect/bindings.cc:168
+#: dselect/bindings.cc
 msgid "Quit, rejecting conflict/dependency suggestions"
 msgstr "Έξοδος, με απόρριψη προειδοποιήσεων για εξαρτήσεις/ασυμβατότητες"
 
-#: dselect/bindings.cc:169
+#: dselect/bindings.cc
 msgid "Abort - quit without making changes"
 msgstr "Εγκατάλειψη - έξοδος χωρίς αλλαγές"
 
-#: dselect/bindings.cc:170
+#: dselect/bindings.cc
 msgid "Revert to old state for all packages"
 msgstr "Επαναφορά στην προηγούμενη κατάσταση όλων των πακέτων"
 
-#: dselect/bindings.cc:171
+#: dselect/bindings.cc
 msgid "Revert to suggested state for all packages"
 msgstr "Επαναφορά σε προτεινόμενη κατάσταση όλων των πακέτων"
 
-#: dselect/bindings.cc:172
+#: dselect/bindings.cc
 msgid "Revert to directly requested state for all packages"
 msgstr "Επαναφορά στην ζητούμενη κατάσταση όλων των πακέτων"
 
-#: dselect/bindings.cc:173
+#: dselect/bindings.cc
 #, fuzzy
 msgid "Revert to currently installed state for all packages"
 msgstr "Επαναφορά στην ζητούμενη κατάσταση όλων των πακέτων"
 
-#: dselect/bindings.cc:176
+#: dselect/bindings.cc
 msgid "Select currently-highlighted access method"
 msgstr "Επιλογή της τρέχουσας μεθόδου πρόσβασης"
 
-#: dselect/bindings.cc:177
+#: dselect/bindings.cc
 msgid "Quit without changing selected access method"
 msgstr "Έξοδος χωρίς αλλαγή της επιλεγμένης μεθόδου"
 
-#: dselect/helpmsgs.cc:29
+#: dselect/helpmsgs.cc
 msgid "Keystrokes"
 msgstr "Συνδυασμοί πλήκτρων"
 
-#: dselect/helpmsgs.cc:29
+#: dselect/helpmsgs.cc
 #, fuzzy
 msgid ""
 "Motion keys: Next/Previous, Top/End, Up/Down, Backwards/Forwards:\n"
@@ -352,11 +352,11 @@ msgstr ""
 "   D     ορισμός όλων ως άμεσα αιτούμενα      n, \\  επανάληψη τελευταίας "
 "αναζήτησης\n"
 
-#: dselect/helpmsgs.cc:55
+#: dselect/helpmsgs.cc
 msgid "Introduction to package selections"
 msgstr "Εισαγωγή στις επιλογές πακέτων"
 
-#: dselect/helpmsgs.cc:55
+#: dselect/helpmsgs.cc
 msgid ""
 "Welcome to dselect's main package listing.\n"
 "\n"
@@ -412,11 +412,11 @@ msgstr ""
 "μια δεύτερη λίστα.\n"
 "Πιέστε <space> για κλείσει η βοήθεια και να δείτε τη λίστα τώρα.\n"
 
-#: dselect/helpmsgs.cc:80
+#: dselect/helpmsgs.cc
 msgid "Introduction to read-only package list browser"
 msgstr "Εισαγωγή στην προβολή πακέτων για ανάγνωση μόνο"
 
-#: dselect/helpmsgs.cc:80
+#: dselect/helpmsgs.cc
 msgid ""
 "Welcome to dselect's main package listing.\n"
 "\n"
@@ -456,11 +456,11 @@ msgstr ""
 "\n"
 "Πιέστε <enter> για κλείσει η βοήθεια και να δείτε τη λίστα τώρα.\n"
 
-#: dselect/helpmsgs.cc:99
+#: dselect/helpmsgs.cc
 msgid "Introduction to conflict/dependency resolution sub-list"
 msgstr "Εισαγωγή στην λίστα ανάλυσης εξαρτήσεων/συγκρούσεων"
 
-#: dselect/helpmsgs.cc:99
+#: dselect/helpmsgs.cc
 msgid ""
 "Dependency/conflict resolution - introduction.\n"
 "\n"
@@ -523,11 +523,11 @@ msgstr ""
 "Πιέστε <enter> για να φύγετε από τη βοήθεια και να δείτε την προτεινόμενη\n"
 "λίστα. Πιέστε `?' για βοήθεια.\n"
 
-#: dselect/helpmsgs.cc:125
+#: dselect/helpmsgs.cc
 msgid "Display, part 1: package listing and status chars"
 msgstr "Οθόνη, μέρος 1ο: εμφάνιση καταλόγου πακέτων και χαρακτήρων κατάστασης"
 
-#: dselect/helpmsgs.cc:125
+#: dselect/helpmsgs.cc
 #, fuzzy
 msgid ""
 "The top half of the screen shows a list of packages.  For each package you "
@@ -592,11 +592,11 @@ msgstr ""
 "η διαθέσιμη έκδοση (πιέστε shift-V για να εμφανίσετε/κρύψετε) και μια "
 "περίληψη.\n"
 
-#: dselect/helpmsgs.cc:152
+#: dselect/helpmsgs.cc
 msgid "Display, part 2: list highlight; information display"
 msgstr "Οθόνη, μέρος 2ο: εστίαση λίστας, εμφάνιση πληροφοριών"
 
-#: dselect/helpmsgs.cc:152
+#: dselect/helpmsgs.cc
 msgid ""
 "* Highlight: One line in the package list will be highlighted.  It "
 "indicates\n"
@@ -648,11 +648,11 @@ msgstr ""
 "πληροφορίες\n"
 "  και το `Ι' για την απόκρυψη των πληροφοριών ή την επέκτασή τους.\n"
 
-#: dselect/helpmsgs.cc:176
+#: dselect/helpmsgs.cc
 msgid "Introduction to method selection display"
 msgstr "Εισαγωγή στην οθόνη μεθόδου επιλογής"
 
-#: dselect/helpmsgs.cc:176
+#: dselect/helpmsgs.cc
 msgid ""
 "dselect and dpkg can do automatic installation, loading the package files to "
 "be\n"
@@ -698,11 +698,11 @@ msgstr ""
 "`k'\n"
 "τώρα, ή από την επιλογή βοηθείας πιέζοντας `?'.\n"
 
-#: dselect/helpmsgs.cc:196
+#: dselect/helpmsgs.cc
 msgid "Keystrokes for method selection"
 msgstr "Πλήκτρα για την επιλογή της μεθόδου"
 
-#: dselect/helpmsgs.cc:196
+#: dselect/helpmsgs.cc
 #, fuzzy
 msgid ""
 "Motion keys: Next/Previous, Top/End, Up/Down, Backwards/Forwards:\n"
@@ -755,104 +755,104 @@ msgstr ""
 "  /                αναζήτηση (πιέστε return για να ακυρώσετε)\n"
 "  \\                επανάληψη τελευταίας αναζήτησης\n"
 
-#: dselect/main.cc:63
+#: dselect/main.cc
 msgid "Type dselect --help for help."
 msgstr "Πληκτρολογήστε dselect --help για βοήθεια."
 
-#: dselect/main.cc:145
+#: dselect/main.cc
 msgid "a"
 msgstr "a"
 
-#: dselect/main.cc:145
+#: dselect/main.cc
 msgid "[A]ccess"
 msgstr "Πρόσβαση ([a])"
 
-#: dselect/main.cc:145
+#: dselect/main.cc
 msgid "Choose the access method to use."
 msgstr "Επιλέξτε τη μέθοδο πρόσβασης που θα χρησιμοποιήσετε"
 
-#: dselect/main.cc:146
+#: dselect/main.cc
 msgid "u"
 msgstr "u"
 
-#: dselect/main.cc:146
+#: dselect/main.cc
 msgid "[U]pdate"
 msgstr "Ανανέωση([u])"
 
-#: dselect/main.cc:146
+#: dselect/main.cc
 msgid "Update list of available packages, if possible."
 msgstr "Ανανέωσε τη λίστα των διαθέσιμων πακέτων, αν είναι δυνατό."
 
-#: dselect/main.cc:147
+#: dselect/main.cc
 msgid "s"
 msgstr "s"
 
-#: dselect/main.cc:147
+#: dselect/main.cc
 msgid "[S]elect"
 msgstr "Επιλογή ([s])"
 
-#: dselect/main.cc:147
+#: dselect/main.cc
 msgid "Request which packages you want on your system."
 msgstr "Επιλέξτε ποια πακέτα θέλετε στο σύστημά σας."
 
-#: dselect/main.cc:148
+#: dselect/main.cc
 msgid "i"
 msgstr "i"
 
-#: dselect/main.cc:148
+#: dselect/main.cc
 msgid "[I]nstall"
 msgstr "Εγκατάσταση ([i])"
 
-#: dselect/main.cc:148
+#: dselect/main.cc
 msgid "Install and upgrade wanted packages."
 msgstr "Εγκατάσταση και αναβάθμιση ζητούμενων πακέτων."
 
-#: dselect/main.cc:149
+#: dselect/main.cc
 msgid "c"
 msgstr "c"
 
-#: dselect/main.cc:149
+#: dselect/main.cc
 msgid "[C]onfig"
 msgstr "Ρύθμιση ([c])"
 
-#: dselect/main.cc:149
+#: dselect/main.cc
 msgid "Configure any packages that are unconfigured."
 msgstr "Ρύθμιση όποιων πακέτων είναι μη ρυθμισμένα."
 
-#: dselect/main.cc:150
+#: dselect/main.cc
 msgid "r"
 msgstr "r"
 
-#: dselect/main.cc:150
+#: dselect/main.cc
 msgid "[R]emove"
 msgstr "Αφαίρεση ([r])"
 
-#: dselect/main.cc:150
+#: dselect/main.cc
 msgid "Remove unwanted software."
 msgstr "Αφαίρεση ανεπιθύμητου λογισμικού."
 
-#: dselect/main.cc:151
+#: dselect/main.cc
 msgid "q"
 msgstr "q"
 
-#: dselect/main.cc:151
+#: dselect/main.cc
 msgid "[Q]uit"
 msgstr "Έξοδος ([q])"
 
-#: dselect/main.cc:151
+#: dselect/main.cc
 msgid "Quit dselect."
 msgstr "Έξοδος από το dselect."
 
-#: dselect/main.cc:152
+#: dselect/main.cc
 msgid "menu"
 msgstr "μενού"
 
-#: dselect/main.cc:157
+#: dselect/main.cc
 #, fuzzy, c-format
 msgid "Debian `%s' package handling frontend version %s.\n"
 msgstr "Πρόγραμμα διαχείρισης των πακέτων του Debian `%s'"
 
-#: dselect/main.cc:160
+#: dselect/main.cc
 #, fuzzy
 msgid ""
 "This is free software; see the GNU General Public License version 2 or\n"
@@ -863,96 +863,103 @@ msgstr ""
 "μεταγενέστερης για συνθήκες αντιγραφής. Δεν υπάρχει ΚΑΜΙΑ εγγύηση.\n"
 "Δείτε dpkg-deb --licence για λεπτομέρειες.\n"
 
-#: dselect/main.cc:169 dselect/main.cc:217
+#: dselect/main.cc
 msgid "<standard output>"
 msgstr ""
 
-#: dselect/main.cc:180
+#: dselect/main.cc
 #, c-format
 msgid ""
-"Usage: %s [<option> ...] [<action> ...]\n"
+"Usage: %s [<option>...] [<command>...]\n"
 "\n"
 msgstr ""
 
-#: dselect/main.cc:184
+#: dselect/main.cc
+#, c-format
+msgid "Commands:\n"
+msgstr ""
+
+#: dselect/main.cc
 #, c-format
 msgid ""
 "Options:\n"
-"  --admindir <directory>     Use <directory> instead of %s.\n"
-"  --expert                   Turn on expert mode.\n"
-"  --debug <file> | -D<file>  Turn on debugging, sending output to <file>.\n"
-"  --colour | --color screenpart:[foreground],[background][:attr[+attr+...]]\n"
-"                             Configure screen colours.\n"
-"\n"
+"      --admindir <directory>       Use <directory> instead of %s.\n"
+"      --expert                     Turn on expert mode.\n"
+"  -D, --debug <file>               Turn on debugging, send output to "
+"<file>.\n"
+"      --color <color-spec>         Configure screen colors.\n"
+"      --colour <color-spec>        Ditto.\n"
 msgstr ""
 
-#: dselect/main.cc:193
+#: dselect/main.cc
 #, c-format
 msgid ""
-"  --help                     Show this help message.\n"
-"  --version                  Show the version.\n"
+"  -?, --help                       Show this help message.\n"
+"      --version                    Show the version.\n"
 "\n"
 msgstr ""
 
-#: dselect/main.cc:197
-#, fuzzy, c-format
-#| msgid "Section"
-msgid "Actions:\n"
-msgstr "Τομέας"
-
-#: dselect/main.cc:202
+#: dselect/main.cc
 #, c-format
-msgid "Screenparts:\n"
+msgid ""
+"<color-spec> is <screen-part>:[<foreground>],[<background>][:"
+"<attr>[+<attr>]...]\n"
+msgstr ""
+
+#: dselect/main.cc
+#, fuzzy, c-format
+#| msgid "Screenparts:\n"
+msgid "<screen-part> is:"
 msgstr "Οθόνες:\n"
 
-#: dselect/main.cc:207
+#: dselect/main.cc
 #, c-format
-msgid "Colours:\n"
-msgstr "Χρώματα:\n"
+msgid "<color> is:"
+msgstr ""
 
-#: dselect/main.cc:212
+#: dselect/main.cc
 #, c-format
-msgid "Attributes:\n"
-msgstr "Ιδιότητες:\n"
+msgid "<attr> is:"
+msgstr ""
 
-#: dselect/main.cc:232
+#: dselect/main.cc
 #, c-format
 msgid "couldn't open debug file `%.255s'\n"
 msgstr "αδύνατο το άνοιγμα του αρχείου debug `%.255s'\n"
 
-#: dselect/main.cc:253
+#: dselect/main.cc
 #, fuzzy, c-format
 #| msgid "Invalid %s `%s'\n"
 msgid "invalid %s '%s'"
 msgstr "Μη έγκυρο %s `%s'\n"
 
-#: dselect/main.cc:272
+#: dselect/main.cc
 msgid "screen part"
 msgstr "τμήμα οθόνης"
 
-#: dselect/main.cc:278
+#: dselect/main.cc
 #, fuzzy
 #| msgid "Null colour specification\n"
 msgid "null colour specification"
 msgstr "κενός χρωματικός προσδιορισμός\n"
 
-#: dselect/main.cc:286 dselect/main.cc:291
+#: dselect/main.cc
 msgid "colour"
 msgstr "χρώμα"
 
-#: dselect/main.cc:299
+#: dselect/main.cc
 msgid "colour attribute"
 msgstr "ιδιότητα χρώματος"
 
-#: dselect/main.cc:333
+#: dselect/main.cc
 msgid "Terminal does not appear to support cursor addressing.\n"
 msgstr "Το τερματικό δεν φαίνεται να υποστηρίζει κατευθυνόμενο δρομέα.\n"
 
-#: dselect/main.cc:335
+#: dselect/main.cc
 msgid "Terminal does not appear to support highlighting.\n"
 msgstr "Το τερματικό δεν φαίνεται να υποστηρίζει τονισμό.\n"
 
-#: dselect/main.cc:337
+#: dselect/main.cc
 #, fuzzy, c-format
 msgid ""
 "Set your TERM variable correctly, use a better terminal,\n"
@@ -961,11 +968,11 @@ msgstr ""
 "Ορίστε τη μεταβλητή TERM σωστά, χρησιμοποιήστε ένα καλύτερο τερματικό,\n"
 "ή χρησιμοποιήστε με το εργαλείο διαχείρισης μεμονωμένων πακέτων "
 
-#: dselect/main.cc:340
+#: dselect/main.cc
 msgid "terminal lacks necessary features, giving up"
 msgstr "το τερματικό δεν υποστηρίζει απαραίτητα χαρακτηριστικά, εγκατάλειψη"
 
-#: dselect/main.cc:425
+#: dselect/main.cc
 msgid ""
 "\n"
 "\n"
@@ -979,13 +986,13 @@ msgstr ""
 "Πιέστε <enter> για αποδοχή της επιλογής.   το ^L ανανεώνει την οθόνη.\n"
 "\n"
 
-#: dselect/main.cc:430
+#: dselect/main.cc
 msgid ""
 "Copyright (C) 1994-1996 Ian Jackson.\n"
 "Copyright (C) 2000,2001 Wichert Akkerman.\n"
 msgstr ""
 
-#: dselect/main.cc:436
+#: dselect/main.cc
 msgid ""
 "\n"
 "\n"
@@ -996,58 +1003,58 @@ msgstr ""
 "Πρόσβαση μόνο για ανάγνωση: Μόνο η προεπισκόπηση των επιλογών είναι "
 "διαθέσιμη!"
 
-#: dselect/main.cc:455
+#: dselect/main.cc
 msgid "failed to getch in main menu"
 msgstr "απέτυχε η getch στο κυρίως μενού"
 
-#: dselect/main.cc:538
+#: dselect/main.cc
 #, c-format
 msgid "unknown action string `%.50s'"
 msgstr "άγνωστη συμβολοσειρά δράσης `%.50s'"
 
-#: dselect/methlist.cc:66
+#: dselect/methlist.cc
 msgid "Abbrev."
 msgstr "Σύντμηση"
 
-#: dselect/methlist.cc:67 dselect/pkgdisplay.cc:188 dselect/pkginfo.cc:110
+#: dselect/methlist.cc dselect/pkgdisplay.cc dselect/pkginfo.cc
 msgid "Description"
 msgstr "Περιγραφή"
 
-#: dselect/methlist.cc:73
+#: dselect/methlist.cc
 msgid "dselect - list of access methods"
 msgstr "dselect - λίστα των μεθόδων πρόσβασης"
 
-#: dselect/methlist.cc:82
+#: dselect/methlist.cc
 #, c-format
 msgid "Access method `%s'."
 msgstr "Μέθοδος πρόσβασης `%s'."
 
-#: dselect/methlist.cc:161 dselect/pkglist.cc:587
+#: dselect/methlist.cc dselect/pkglist.cc
 msgid "doupdate failed"
 msgstr "η doupdate απέτυχε"
 
-#: dselect/methlist.cc:164 dselect/pkglist.cc:590
+#: dselect/methlist.cc dselect/pkglist.cc
 msgid "failed to unblock SIGWINCH"
 msgstr "απέτυχε η απεμπλοκή του SIGWINCH"
 
-#: dselect/methlist.cc:169 dselect/pkglist.cc:595
+#: dselect/methlist.cc dselect/pkglist.cc
 msgid "failed to re-block SIGWINCH"
 msgstr "απέτυχε η επανεμπλοκή του SIGWINCH"
 
-#: dselect/methlist.cc:170 dselect/pkglist.cc:597
+#: dselect/methlist.cc dselect/pkglist.cc
 msgid "getch failed"
 msgstr "η getch απέτυχε"
 
-#: dselect/methlist.cc:187
+#: dselect/methlist.cc
 #, fuzzy
 msgid "Explanation"
 msgstr "εξήγηση του "
 
-#: dselect/methlist.cc:197
+#: dselect/methlist.cc
 msgid "No explanation available."
 msgstr "Καμία διαθέσιμη εξήγηση."
 
-#: dselect/method.cc:67
+#: dselect/method.cc
 #, c-format
 msgid ""
 "\n"
@@ -1058,7 +1065,7 @@ msgstr ""
 "\n"
 "%s: %s\n"
 
-#: dselect/method.cc:70
+#: dselect/method.cc
 msgid ""
 "\n"
 "Press <enter> to continue."
@@ -1066,192 +1073,202 @@ msgstr ""
 "\n"
 "Πατήστε <enter> για συνέχεια."
 
-#: dselect/method.cc:82
+#: dselect/method.cc
 msgid "cannot unlock access method area"
 msgstr ""
 
-#: dselect/method.cc:96
+#: dselect/method.cc
 #, fuzzy
 #| msgid " does not appear to be available\n"
 msgid "no access methods are available"
 msgstr " δε φαίνεται να είναι διαθέσιμο\n"
 
-#: dselect/method.cc:115
+#: dselect/method.cc
 msgid "requested operation requires superuser privilege"
 msgstr ""
 
-#: dselect/method.cc:118
+#: dselect/method.cc
 #, fuzzy
 #| msgid "Choose the access method to use."
 msgid "cannot open or create access method lockfile"
 msgstr "Επιλέξτε τη μέθοδο πρόσβασης που θα χρησιμοποιήσετε"
 
-#: dselect/method.cc:125
+#: dselect/method.cc
 msgid "the access method area is already locked"
 msgstr ""
 
-#: dselect/method.cc:128
+#: dselect/method.cc
 #, fuzzy
 #| msgid "dselect - list of access methods"
 msgid "cannot lock access method area"
 msgstr "dselect - λίστα των μεθόδων πρόσβασης"
 
-#: dselect/method.cc:161
+#: dselect/method.cc
 #, c-format
 msgid "Press <enter> to continue.\n"
 msgstr "Πατήστε <enter> για συνέχεια.\n"
 
-#: dselect/method.cc:162
+#: dselect/method.cc
 #, fuzzy
 msgid "<standard error>"
 msgstr "σφάλμα εγγραφής στην πρότυπη έξοδο σφαλμάτων (stderr)"
 
-#: dselect/method.cc:165
+#: dselect/method.cc
 msgid "error reading acknowledgement of program failure message"
 msgstr "σφάλμα ανάγνωσης επιβεβαίωσης του μηνύματος σφάλματος του προγράμματος"
 
-#: dselect/method.cc:187
+#: dselect/method.cc
 msgid "no access method is selected or configured"
 msgstr ""
 
-#: dselect/method.cc:196
+#: dselect/method.cc
 msgid "update available list script"
 msgstr "ανανέωση της λίστας των διαθέσιμων πακέτων"
 
-#: dselect/method.cc:200
+#: dselect/method.cc
 msgid "installation script"
 msgstr "σενάριο εγκατάστασης"
 
-#: dselect/method.cc:246
+#: dselect/method.cc
 msgid "query/setup script"
 msgstr "σενάριο ερωτήματος/εγκατάστασης"
 
-#: dselect/methparse.cc:53
+#: dselect/methparse.cc
 #, c-format
 msgid "syntax error in method options file `%.250s' -- %s"
 msgstr "σφάλμα σύνταξης στο αρχείο επιλογών μεθόδων `%.250s' -- %s"
 
-#: dselect/methparse.cc:59
+#: dselect/methparse.cc
 #, c-format
 msgid "error reading options file `%.250s'"
 msgstr "σφάλμα ανάγνωσης αρχείου επιλογών `%.250s'"
 
-#: dselect/methparse.cc:93
+#: dselect/methparse.cc
 #, c-format
 msgid "unable to read `%.250s' directory for reading methods"
 msgstr "αδύνατη η ανάγνωση του καταλόγου `%.250s' για μεθόδους ανάγνωσης"
 
-#: dselect/methparse.cc:109
+#: dselect/methparse.cc
 #, c-format
 msgid "method `%.250s' has name that is too long (%d > %d characters)"
 msgstr "η μέθοδος `%.250s' έχει πολύ μακρύ όνομα (%d > %d χαρακτήρες)"
 
-#: dselect/methparse.cc:120
+#: dselect/methparse.cc
 #, c-format
 msgid "unable to access method script `%.250s'"
 msgstr "αδύνατη η πρόσβαση του σεναρίου μεθόδου `%.250s'"
 
-#: dselect/methparse.cc:126
+#: dselect/methparse.cc
 #, c-format
 msgid "unable to read method options file `%.250s'"
 msgstr "αδύνατη η ανάγνωση του αρχείου επιλογών μεθόδων `%.250s'"
 
-#: dselect/methparse.cc:150
+#: dselect/methparse.cc
 msgid "non-digit where digit wanted"
 msgstr "μη ψηφίο όπου αναμενόταν ψηφίο"
 
-#: dselect/methparse.cc:153
-msgid "EOF in index string"
+#: dselect/methparse.cc
+#, fuzzy
+#| msgid "EOF in index string"
+msgid "end of file in index string"
 msgstr "EOF στη συμβολοσειρά index"
 
-#: dselect/methparse.cc:156
+#: dselect/methparse.cc
 msgid "index string too long"
 msgstr "πολύ μεγάλη συμβολοσειρά index "
 
-#: dselect/methparse.cc:159
+#: dselect/methparse.cc
 msgid "newline before option name start"
 msgstr "χαρακτήρας newline πριν το όνομα επιλογής"
 
-#: dselect/methparse.cc:161
-msgid "EOF before option name start"
-msgstr "EOF πριν το όνομα επιλογής"
+#: dselect/methparse.cc
+#, fuzzy
+#| msgid "newline before option name start"
+msgid "end of file before option name start"
+msgstr "χαρακτήρας newline πριν το όνομα επιλογής"
 
-#: dselect/methparse.cc:165
+#: dselect/methparse.cc
 msgid "nonalpha where option name start wanted"
 msgstr "μη αλφαβητικός χαρακτήρας όπου αναμενόταν όνομα επιλογής"
 
-#: dselect/methparse.cc:167
+#: dselect/methparse.cc
 msgid "non-alphanum in option name"
 msgstr "μη αλφαριθμητικός χαρακτήρας στο όνομα επιλογής"
 
-#: dselect/methparse.cc:170
-msgid "EOF in option name"
+#: dselect/methparse.cc
+#, fuzzy
+#| msgid "EOF in option name"
+msgid "end of file in option name"
 msgstr "EOF σε όνομα επιλογής"
 
-#: dselect/methparse.cc:175
+#: dselect/methparse.cc
 msgid "newline before summary"
 msgstr "χαρακτήρας newline πριν την περίληψη"
 
-#: dselect/methparse.cc:177
-msgid "EOF before summary"
-msgstr "EOF πριν την περίληψη"
+#: dselect/methparse.cc
+#, fuzzy
+#| msgid "newline before summary"
+msgid "end of file before summary"
+msgstr "χαρακτήρας newline πριν την περίληψη"
 
-#: dselect/methparse.cc:183
-msgid "EOF in summary - missing newline"
+#: dselect/methparse.cc
+#, fuzzy
+#| msgid "EOF in summary - missing newline"
+msgid "end of file in summary - missing newline"
 msgstr "EOF στην περίληψη - λείπει ο χαρακτήρας newline"
 
-#: dselect/methparse.cc:193
+#: dselect/methparse.cc
 #, c-format
 msgid "unable to open option description file `%.250s'"
 msgstr "αδύνατο το άνοιγμα του αρχείου περιγραφής επιλογών `%.250s'"
 
-#: dselect/methparse.cc:197
+#: dselect/methparse.cc
 #, c-format
 msgid "unable to stat option description file `%.250s'"
 msgstr "αδύνατο η εύρεση κατάστασης του αρχείου περιγραφής επιλογών `%.250s'"
 
-#: dselect/methparse.cc:201
+#: dselect/methparse.cc
 #, c-format
 msgid "failed to read option description file `%.250s'"
 msgstr "απέτυχε η ανάγνωση του αρχείου περιγραφής επιλογών`%.250s'"
 
-#: dselect/methparse.cc:204
+#: dselect/methparse.cc
 #, c-format
 msgid "error during read of option description file `%.250s'"
 msgstr "σφάλμα κατά την ανάγνωση του αρχείου περιγραφής επιλογών `%.250s'"
 
-#: dselect/methparse.cc:227
+#: dselect/methparse.cc
 #, c-format
 msgid "error during read of method options file `%.250s'"
 msgstr "σφάλμα κατά την ανάγνωση του αρχείου επιλογών μεθόδων `%.250s'"
 
-#: dselect/methparse.cc:250
+#: dselect/methparse.cc
 #, c-format
 msgid "unable to open current option file `%.250s'"
 msgstr "αδύνατο το άνοιγμα του τρέχοντος αρχείου επιλογών `%.250s'"
 
-#: dselect/methparse.cc:286
+#: dselect/methparse.cc
 #, c-format
 msgid "unable to write new option to `%.250s'"
 msgstr "αδύνατη η εγγραφή νέας επιλογής στο `%.250s'"
 
-#: dselect/pkgdisplay.cc:36
+#: dselect/pkgdisplay.cc
 msgid "new package"
 msgstr "νέο πακέτο"
 
-#: dselect/pkgdisplay.cc:37
+#: dselect/pkgdisplay.cc
 msgid "install"
 msgstr "εγκατάσταση"
 
-#: dselect/pkgdisplay.cc:38
+#: dselect/pkgdisplay.cc
 msgid "hold"
 msgstr "συγκράτηση"
 
-#: dselect/pkgdisplay.cc:39
+#: dselect/pkgdisplay.cc
 msgid "remove"
 msgstr "αφαίρεση"
 
-#: dselect/pkgdisplay.cc:40
+#: dselect/pkgdisplay.cc
 msgid "purge"
 msgstr "διαγραφή"
 
@@ -1259,331 +1276,325 @@ msgstr "διαγραφή"
 #. * the empty string to store information about the translation. DO NOT
 #. * CHANGE THAT IN A TRANSLATION! The code really relies on that being
 #. * a single space.
-#: dselect/pkgdisplay.cc:47
+#: dselect/pkgdisplay.cc
 msgid " "
 msgstr " "
 
-#: dselect/pkgdisplay.cc:48
+#: dselect/pkgdisplay.cc
 msgid "REINSTALL"
 msgstr "ΕΠΑΝΕΓΚΑΤΑΣΤΑΣΗ"
 
-#: dselect/pkgdisplay.cc:51
+#: dselect/pkgdisplay.cc
 msgid "not installed"
 msgstr "δεν είναι εγκατεστημένο"
 
-#: dselect/pkgdisplay.cc:52
+#: dselect/pkgdisplay.cc
 msgid "removed (configs remain)"
 msgstr "αφαιρέθηκε (παραμένουν οι ρυθμίσεις)"
 
-#: dselect/pkgdisplay.cc:53
+#: dselect/pkgdisplay.cc
 msgid "half installed"
 msgstr "μισόεγκατεστημένο"
 
-#: dselect/pkgdisplay.cc:54
+#: dselect/pkgdisplay.cc
 msgid "unpacked (not set up)"
 msgstr "αποσυμπιεσμένο (όχι ρυθμισμένο)"
 
-#: dselect/pkgdisplay.cc:55
+#: dselect/pkgdisplay.cc
 msgid "half configured (config failed)"
 msgstr ""
 
-#: dselect/pkgdisplay.cc:56
+#: dselect/pkgdisplay.cc
 msgid "awaiting trigger processing"
 msgstr ""
 
-#: dselect/pkgdisplay.cc:57
+#: dselect/pkgdisplay.cc
 msgid "triggered"
 msgstr ""
 
-#: dselect/pkgdisplay.cc:58
+#: dselect/pkgdisplay.cc
 msgid "installed"
 msgstr "εγκατεστημένο"
 
-#: dselect/pkgdisplay.cc:61
+#: dselect/pkgdisplay.cc
 msgid "Required"
 msgstr "Απαιτούμενο"
 
-#: dselect/pkgdisplay.cc:62
+#: dselect/pkgdisplay.cc
 msgid "Important"
 msgstr "Σημαντικό"
 
-#: dselect/pkgdisplay.cc:63
+#: dselect/pkgdisplay.cc
 msgid "Standard"
 msgstr "Βασικό"
 
-#: dselect/pkgdisplay.cc:64
+#: dselect/pkgdisplay.cc
 msgid "Optional"
 msgstr "Προαιρετικό"
 
-#: dselect/pkgdisplay.cc:65
+#: dselect/pkgdisplay.cc
 msgid "Extra"
 msgstr "Επιπλέον"
 
-#: dselect/pkgdisplay.cc:66
-msgid "!Bug!"
-msgstr "!σφάλμα!"
-
-#: dselect/pkgdisplay.cc:67
+#: dselect/pkgdisplay.cc
 msgid "Unclassified"
 msgstr "Αταξινόμητο"
 
-#: dselect/pkgdisplay.cc:70
+#: dselect/pkgdisplay.cc
 msgid "suggests"
 msgstr "προτείνει"
 
-#: dselect/pkgdisplay.cc:71
+#: dselect/pkgdisplay.cc
 msgid "recommends"
 msgstr "συστήνει"
 
-#: dselect/pkgdisplay.cc:72
+#: dselect/pkgdisplay.cc
 msgid "depends on"
 msgstr "εξαρτάται από "
 
-#: dselect/pkgdisplay.cc:73
+#: dselect/pkgdisplay.cc
 msgid "pre-depends on"
 msgstr "προεξαρτάται από "
 
-#: dselect/pkgdisplay.cc:74
+#: dselect/pkgdisplay.cc
 msgid "breaks"
 msgstr ""
 
-#: dselect/pkgdisplay.cc:75
+#: dselect/pkgdisplay.cc
 msgid "conflicts with"
 msgstr "ασύμβατο με"
 
-#: dselect/pkgdisplay.cc:76
+#: dselect/pkgdisplay.cc
 msgid "provides"
 msgstr "παρέχει"
 
-#: dselect/pkgdisplay.cc:77
+#: dselect/pkgdisplay.cc
 msgid "replaces"
 msgstr "αντικαθιστά"
 
-#: dselect/pkgdisplay.cc:78
+#: dselect/pkgdisplay.cc
 msgid "enhances"
 msgstr "επεκτείνει"
 
-#: dselect/pkgdisplay.cc:81
+#: dselect/pkgdisplay.cc
 msgid "Req"
 msgstr "Req"
 
-#: dselect/pkgdisplay.cc:82
+#: dselect/pkgdisplay.cc
 msgid "Imp"
 msgstr "Imp"
 
-#: dselect/pkgdisplay.cc:83
+#: dselect/pkgdisplay.cc
 msgid "Std"
 msgstr "Std"
 
-#: dselect/pkgdisplay.cc:84
+#: dselect/pkgdisplay.cc
 msgid "Opt"
 msgstr "Opt"
 
-#: dselect/pkgdisplay.cc:85
+#: dselect/pkgdisplay.cc
 msgid "Xtr"
 msgstr "Xtr"
 
-#: dselect/pkgdisplay.cc:86
+#: dselect/pkgdisplay.cc
 msgid "bUG"
 msgstr "bUG"
 
-#: dselect/pkgdisplay.cc:87
+#: dselect/pkgdisplay.cc
 msgid "?"
 msgstr ";"
 
-#: dselect/pkgdisplay.cc:95 dselect/pkgdisplay.cc:115
+#: dselect/pkgdisplay.cc
 msgid "Broken"
 msgstr "Κατεστραμμένο"
 
-#: dselect/pkgdisplay.cc:96
+#: dselect/pkgdisplay.cc
 msgid "New"
 msgstr "Νέο"
 
-#: dselect/pkgdisplay.cc:97
-msgid "Updated"
-msgstr "Ενημερωμένο"
+#: dselect/pkgdisplay.cc
+msgid "Upgradable"
+msgstr ""
 
-#: dselect/pkgdisplay.cc:98
+#: dselect/pkgdisplay.cc
 msgid "Obsolete/local"
 msgstr "Απαρχαιωμένο/τοπικό"
 
-#: dselect/pkgdisplay.cc:99
-msgid "Up-to-date"
-msgstr "Ενημερωμένο"
+#: dselect/pkgdisplay.cc
+msgid "Installed"
+msgstr "Εγκατεστημένα"
 
-#: dselect/pkgdisplay.cc:100
+#: dselect/pkgdisplay.cc
 msgid "Available"
 msgstr "Διαθέσιμο"
 
-#: dselect/pkgdisplay.cc:101 dselect/pkgdisplay.cc:117
+#: dselect/pkgdisplay.cc
 msgid "Removed"
 msgstr "Αφαιρέθηκε"
 
-#: dselect/pkgdisplay.cc:102 dselect/pkgdisplay.cc:111
+#: dselect/pkgdisplay.cc
 msgid "Brokenly installed packages"
 msgstr "Χαλασμένα και εγκατεστημένα πακέτα"
 
-#: dselect/pkgdisplay.cc:103
+#: dselect/pkgdisplay.cc
 msgid "Newly available packages"
 msgstr "Νέα διαθέσιμα πακέτα"
 
-#: dselect/pkgdisplay.cc:104
-msgid "Updated packages (newer version is available)"
-msgstr "Ενημερωμένα πακέτα (νεώτερη έκδοση είναι διαθέσιμη)"
+#: dselect/pkgdisplay.cc
+#, fuzzy
+#| msgid "Newly available packages"
+msgid "Upgradable packages"
+msgstr "Νέα διαθέσιμα πακέτα"
 
-#: dselect/pkgdisplay.cc:105
-msgid "Obsolete and local packages present on system"
+#: dselect/pkgdisplay.cc
+#, fuzzy
+#| msgid "Obsolete and local packages present on system"
+msgid "Obsolete and locally created packages"
 msgstr "Απαρχαιωμένα και τοπικά πακέτα που υπάρχουν στο σύστημα"
 
-#: dselect/pkgdisplay.cc:106
-msgid "Up to date installed packages"
-msgstr "Εγκατεστημένα πακέτα σε τρέχουσα έκδοση"
+#: dselect/pkgdisplay.cc
+msgid "Installed packages"
+msgstr "Εγκατεστημένα πακέτα"
 
-#: dselect/pkgdisplay.cc:107
-msgid "Available packages (not currently installed)"
-msgstr "Διαθέσιμα πακέτα (προς το παρόν όχι εγκατεστημένα)"
+#: dselect/pkgdisplay.cc
+#, fuzzy
+#| msgid "Up to date installed packages"
+msgid "Available not installed packages"
+msgstr "Εγκατεστημένα πακέτα σε τρέχουσα έκδοση"
 
-#: dselect/pkgdisplay.cc:108
+#: dselect/pkgdisplay.cc
 msgid "Removed and no longer available packages"
 msgstr "Πακέτα που έχουν αφαιρεθεί και δεν είναι πλέον διαθέσιμα"
 
-#: dselect/pkgdisplay.cc:112
-msgid "Installed packages"
-msgstr "Εγκατεστημένα πακέτα"
-
-#: dselect/pkgdisplay.cc:113
+#: dselect/pkgdisplay.cc
 msgid "Removed packages (configuration still present)"
 msgstr "Πακέτα που αφαιρέθηκαν (οι ρυθμίσεις παραμένουν)"
 
-#: dselect/pkgdisplay.cc:114
+#: dselect/pkgdisplay.cc
 msgid "Purged packages and those never installed"
 msgstr "Διεγραμμένα πακέτα καθώς και αυτά που ποτέ δεν εγκαταστάθηκαν"
 
-#: dselect/pkgdisplay.cc:116
-msgid "Installed"
-msgstr "Εγκατεστημένα"
-
-#: dselect/pkgdisplay.cc:118
+#: dselect/pkgdisplay.cc
 msgid "Purged"
 msgstr "Διεγραμμένα"
 
-#: dselect/pkgdisplay.cc:138
+#: dselect/pkgdisplay.cc
 msgid "Error"
 msgstr "Σφάλμα"
 
-#: dselect/pkgdisplay.cc:139
+#: dselect/pkgdisplay.cc
 msgid "Installed?"
 msgstr "Εγκατεστημένο;"
 
-#: dselect/pkgdisplay.cc:140
+#: dselect/pkgdisplay.cc
 msgid "Old mark"
 msgstr "Παλαιά σήμανση"
 
-#: dselect/pkgdisplay.cc:141
+#: dselect/pkgdisplay.cc
 msgid "Marked for"
 msgstr "Σημειώθηκε για"
 
-#: dselect/pkgdisplay.cc:143
+#: dselect/pkgdisplay.cc
 msgid "EIOM"
 msgstr "EIOM"
 
-#: dselect/pkgdisplay.cc:147 dselect/pkgdisplay.cc:150
+#: dselect/pkgdisplay.cc
 msgid "Section"
 msgstr "Τομέας"
 
-#: dselect/pkgdisplay.cc:148
+#: dselect/pkgdisplay.cc
 msgid "Priority"
 msgstr "Προτεραιότητα"
 
-#: dselect/pkgdisplay.cc:152
+#: dselect/pkgdisplay.cc
 msgid "Package"
 msgstr "Πακέτο"
 
-#: dselect/pkgdisplay.cc:161 dselect/pkgdisplay.cc:165
+#: dselect/pkgdisplay.cc
 #, fuzzy
 #| msgid "Avail.ver"
 msgid "Avail.arch"
 msgstr "Διαθ.εκδόσεις"
 
-#: dselect/pkgdisplay.cc:164
+#: dselect/pkgdisplay.cc
 #, fuzzy
 #| msgid "Inst.ver"
 msgid "Inst.arch"
 msgstr "Έκδ.εγκ."
 
-#: dselect/pkgdisplay.cc:178 dselect/pkgdisplay.cc:182
+#: dselect/pkgdisplay.cc
 msgid "Avail.ver"
 msgstr "Διαθ.εκδόσεις"
 
-#: dselect/pkgdisplay.cc:181
+#: dselect/pkgdisplay.cc
 msgid "Inst.ver"
 msgstr "Έκδ.εγκ."
 
-#: dselect/pkgdisplay.cc:197
+#: dselect/pkgdisplay.cc
 msgid "dselect - recursive package listing"
 msgstr "dselect - αναδρομική λίστα πακέτων"
 
-#: dselect/pkgdisplay.cc:199
+#: dselect/pkgdisplay.cc
 msgid "dselect - inspection of package states"
 msgstr "dselect - έλεγχος κατάστασης των πακέτων"
 
-#: dselect/pkgdisplay.cc:200
+#: dselect/pkgdisplay.cc
 msgid "dselect - main package listing"
 msgstr "dselect - εμφάνιση κυρίων πακέτων"
 
-#: dselect/pkgdisplay.cc:208
+#: dselect/pkgdisplay.cc
 msgid " (by section)"
 msgstr " (ανά ενότητα)"
 
-#: dselect/pkgdisplay.cc:211
+#: dselect/pkgdisplay.cc
 msgid " (avail., section)"
 msgstr " (διαθέσιμο, ενότητα)"
 
-#: dselect/pkgdisplay.cc:214
+#: dselect/pkgdisplay.cc
 msgid " (status, section)"
 msgstr " (κατάσταση, ενότητα)"
 
-#: dselect/pkgdisplay.cc:223
+#: dselect/pkgdisplay.cc
 msgid " (by priority)"
 msgstr " (ανά προτεραιότητα)"
 
-#: dselect/pkgdisplay.cc:226
+#: dselect/pkgdisplay.cc
 msgid " (avail., priority)"
 msgstr " (διαθέσιμο, προτεραιότητα)"
 
-#: dselect/pkgdisplay.cc:229
+#: dselect/pkgdisplay.cc
 msgid " (status, priority)"
 msgstr " (κατάσταση, προτεραιότητα)"
 
-#: dselect/pkgdisplay.cc:238
+#: dselect/pkgdisplay.cc
 msgid " (alphabetically)"
 msgstr " (αλφαβητικά)"
 
-#: dselect/pkgdisplay.cc:241
+#: dselect/pkgdisplay.cc
 msgid " (by availability)"
 msgstr " (ανά διαθεσιμότητα)"
 
-#: dselect/pkgdisplay.cc:244
+#: dselect/pkgdisplay.cc
 msgid " (by status)"
 msgstr " (ανά κατάσταση)"
 
-#: dselect/pkgdisplay.cc:259
+#: dselect/pkgdisplay.cc
 msgid " mark:+/=/- terse:v help:?"
 msgstr " σημείωση:+/=/- σύντομα:v βοήθεια:?"
 
-#: dselect/pkgdisplay.cc:260
+#: dselect/pkgdisplay.cc
 msgid " mark:+/=/- verbose:v help:?"
 msgstr " σημείωση:+/=/- αναλυτικά:v βοήθεια:?"
 
-#: dselect/pkgdisplay.cc:262
+#: dselect/pkgdisplay.cc
 msgid " terse:v help:?"
 msgstr " σύντομα:v βοήθεια:?"
 
-#: dselect/pkgdisplay.cc:263
+#: dselect/pkgdisplay.cc
 msgid " verbose:v help:?"
 msgstr " αναλυτικά: βοήθεια:?"
 
-#: dselect/pkginfo.cc:85
+#: dselect/pkginfo.cc
 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 "
@@ -1603,86 +1614,118 @@ msgstr ""
 "Χρησιμοποιήστε το `o' και το `O' για να αλλάξετε τη σειρά ταξινόμησης και να "
 "επιλέξετε πακέτα από ομάδες διαφορετικών ειδών."
 
-#: dselect/pkginfo.cc:98
+#: dselect/pkginfo.cc
 #, fuzzy
 msgid "Interrelationships"
 msgstr "εσωτερικές συσχετίσεις"
 
-#: dselect/pkginfo.cc:117
+#: dselect/pkginfo.cc
 #, fuzzy
 msgid "No description available."
 msgstr "καμία διαθέσιμη περιγραφή."
 
-#: dselect/pkginfo.cc:135
+#: dselect/pkginfo.cc
 #, fuzzy
 msgid "Installed control file information"
 msgstr "εγκατεστημένη πληροφορία ελέγχου για το "
 
-#: dselect/pkginfo.cc:151
+#: dselect/pkginfo.cc
 #, fuzzy
 msgid "Available control file information"
 msgstr "διαθέσιμη έκδοση πληροφορίας ελέγχου αρχείου"
 
-#: dselect/pkglist.cc:425
+#: dselect/pkglist.cc
 #, fuzzy
 #| msgid "Installed packages"
 msgid "there are no packages"
 msgstr "Εγκατεστημένα πακέτα"
 
-#: dselect/pkglist.cc:521
+#: dselect/pkglist.cc
 msgid "invalid search option given"
 msgstr "δόθηκε άκυρη παράμετρος αναζήτησης"
 
-#: dselect/pkglist.cc:536
+#: dselect/pkglist.cc
 msgid "error in regular expression"
 msgstr "σφάλμα στην κανονική έκφραση"
 
-#: dselect/pkgsublist.cc:111
+#: dselect/pkgsublist.cc
 msgid " does not appear to be available\n"
 msgstr " δε φαίνεται να είναι διαθέσιμο\n"
 
-#: dselect/pkgsublist.cc:131
+#: dselect/pkgsublist.cc
 msgid " or "
 msgstr " ή "
 
-#: dselect/pkgtop.cc:58
+#: dselect/pkgtop.cc
 msgid "All"
 msgstr "Όλα"
 
-#: dselect/pkgtop.cc:80
+#: dselect/pkgtop.cc
 msgid "All packages"
 msgstr "Όλα τα πακέτα"
 
-#: dselect/pkgtop.cc:84
+#: dselect/pkgtop.cc
 #, c-format
 msgid "%s packages without a section"
 msgstr "%s πακέτα χωρίς τομέα"
 
-#: dselect/pkgtop.cc:86
+#: dselect/pkgtop.cc
 #, c-format
 msgid "%s packages in section %s"
 msgstr "%s πακέτα στον τομέα %s"
 
-#: dselect/pkgtop.cc:92
+#: dselect/pkgtop.cc
 #, c-format
 msgid "%s %s packages"
 msgstr "%s %s πακέτα"
 
-#: dselect/pkgtop.cc:96
+#: dselect/pkgtop.cc
 #, c-format
 msgid "%s %s packages without a section"
 msgstr "%s %s πακέτα χωρίς τομέα"
 
-#: dselect/pkgtop.cc:98
+#: dselect/pkgtop.cc
 #, c-format
 msgid "%s %s packages in section %s"
 msgstr "%s %s πακέτα στον τομέα %s"
 
-#: dselect/pkgtop.cc:119
+#: dselect/pkgtop.cc
 #, c-format
 msgid "%-*s %s%s%s;  %s (was: %s).  %s"
 msgstr "%-*s %s%s%s;  %s (ήταν: %s).  %s"
 
+#, fuzzy
+#~| msgid "Section"
+#~ msgid "Actions:\n"
+#~ msgstr "Τομέας"
+
+#~ msgid "Colours:\n"
+#~ msgstr "Χρώματα:\n"
+
+#~ msgid "Attributes:\n"
+#~ msgstr "Ιδιότητες:\n"
+
+#~ msgid "EOF before option name start"
+#~ msgstr "EOF πριν το όνομα επιλογής"
+
+#~ msgid "EOF before summary"
+#~ msgstr "EOF πριν την περίληψη"
+
+#~ msgid "!Bug!"
+#~ msgstr "!σφάλμα!"
+
+#~ msgid "Updated"
+#~ msgstr "Ενημερωμένο"
+
+#~ msgid "Up-to-date"
+#~ msgstr "Ενημερωμένο"
+
+#~ msgid "Updated packages (newer version is available)"
+#~ msgstr "Ενημερωμένα πακέτα (νεώτερη έκδοση είναι διαθέσιμη)"
+
+#~ msgid "Available packages (not currently installed)"
+#~ msgstr "Διαθέσιμα πακέτα (προς το παρόν όχι εγκατεστημένα)"
+
 #~ msgid "unable to open new option file `%.250s'"
 #~ msgstr "αδύνατο το άνοιγμα του νέου αρχείου επιλογών `%.250s'"
 
diff --git a/dselect/po/es.po b/dselect/po/es.po
index a474d0ddf..546196720 100644
--- a/dselect/po/es.po
+++ b/dselect/po/es.po
@@ -41,7 +41,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dselect 1.16\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2014-12-23 18:12+0100\n"
+"POT-Creation-Date: 2015-04-06 09:37+0200\n"
 "PO-Revision-Date: 2014-12-02 20:30+0100\n"
 "Last-Translator: Javier Fernández-Sanguino <jfs@debian.org>\n"
 "Language-Team: Spanish <debian-l10n-spanish@lists.debian.org>\n"
@@ -61,27 +61,27 @@ msgstr ""
 "X-POFile-SpellExtra: install Av debug inst onfigurar dselect heading\n"
 "X-POFile-SpellExtra: Redibuja\n"
 
-#: dselect/basecmds.cc:125
+#: dselect/basecmds.cc
 msgid "Search for ? "
 msgstr "Buscar "
 
-#: dselect/basecmds.cc:149
+#: dselect/basecmds.cc
 msgid "Error: "
 msgstr "Error: "
 
-#: dselect/basecmds.cc:180
+#: dselect/basecmds.cc
 msgid "Help: "
 msgstr "Ayuda: "
 
-#: dselect/basecmds.cc:186
+#: dselect/basecmds.cc
 msgid "Press ? for help menu, . for next topic, <space> to exit help."
 msgstr "Pulse ? para el menú, . para el tema siguiente, <intro> para salir."
 
-#: dselect/basecmds.cc:193
+#: dselect/basecmds.cc
 msgid "Help information is available under the following topics:"
 msgstr "La información de ayuda está disponible bajo los siguientes temas:"
 
-#: dselect/basecmds.cc:201
+#: dselect/basecmds.cc
 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. "
@@ -90,239 +90,239 @@ msgstr ""
 "ayuda,\n"
 " o `.' (punto) para leer cada una de las páginas de ayuda. "
 
-#: dselect/basecmds.cc:207
+#: dselect/basecmds.cc
 msgid "error reading keyboard in help"
 msgstr "error al leer del teclado en la ayuda"
 
-#: dselect/baselist.cc:60
+#: dselect/baselist.cc
 msgid "ioctl(TIOCGWINSZ) failed"
 msgstr "falló ioctl(TIOCGWINSZ)"
 
-#: dselect/baselist.cc:63
+#: dselect/baselist.cc
 msgid "doupdate in SIGWINCH handler failed"
 msgstr "falló el `doupdate' en el manejador de SIGWINCH"
 
-#: dselect/baselist.cc:72
+#: dselect/baselist.cc
 msgid "failed to restore old SIGWINCH sigact"
 msgstr "fallo al restablecer la señal antigua SIGWINCH"
 
-#: dselect/baselist.cc:75
+#: dselect/baselist.cc
 msgid "failed to restore old signal mask"
 msgstr "fallo al restablecer la máscara de señal antigua"
 
-#: dselect/baselist.cc:86
+#: dselect/baselist.cc
 msgid "failed to get old signal mask"
 msgstr "fallo al obtener la máscara de señal antigua"
 
-#: dselect/baselist.cc:88
+#: dselect/baselist.cc
 msgid "failed to get old SIGWINCH sigact"
 msgstr "fallo al obtener la señal SIGWINCH antigua"
 
-#: dselect/baselist.cc:93
+#: dselect/baselist.cc
 msgid "failed to block SIGWINCH"
 msgstr "fallo al bloquear SIGWINCH"
 
-#: dselect/baselist.cc:99
+#: dselect/baselist.cc
 msgid "failed to set new SIGWINCH sigact"
 msgstr "fallo al establecer la nueva señal SIGWINCH"
 
-#: dselect/baselist.cc:174
+#: dselect/baselist.cc
 msgid "failed to allocate colour pair"
 msgstr "fallo al asignar un par de colores"
 
-#: dselect/baselist.cc:203
+#: dselect/baselist.cc
 msgid "failed to create title window"
 msgstr "fallo al crear ventana de título"
 
-#: dselect/baselist.cc:207
+#: dselect/baselist.cc
 msgid "failed to create whatinfo window"
 msgstr "fallo al crear ventana de `whatinfo'"
 
-#: dselect/baselist.cc:211
+#: dselect/baselist.cc
 msgid "failed to create baselist pad"
 msgstr "fallo al crear `baselist pad'"
 
-#: dselect/baselist.cc:214
+#: dselect/baselist.cc
 msgid "failed to create heading pad"
 msgstr "fallo al crear `heading pad'"
 
-#: dselect/baselist.cc:218
+#: dselect/baselist.cc
 msgid "failed to create thisstate pad"
 msgstr "fallo al crear `thisstate pad'"
 
-#: dselect/baselist.cc:222
+#: dselect/baselist.cc
 msgid "failed to create info pad"
 msgstr "fallo al crear `info pad'"
 
-#: dselect/baselist.cc:227
+#: dselect/baselist.cc
 msgid "failed to create query window"
 msgstr "fallo al crear ventana de pregunta"
 
-#: dselect/baselist.cc:298
+#: dselect/baselist.cc
 msgid "Keybindings"
 msgstr "Asociaciones de teclas"
 
-#: dselect/baselist.cc:347
+#: dselect/baselist.cc
 #, c-format
 msgid "  -- %d%%, press "
 msgstr "  -- %d%%, pulse "
 
-#: dselect/baselist.cc:350
+#: dselect/baselist.cc
 #, c-format
 msgid "%s for more"
 msgstr "%s para seguir"
 
-#: dselect/baselist.cc:354
+#: dselect/baselist.cc
 #, c-format
 msgid "%s to go back"
 msgstr "%s para volver"
 
-#: dselect/bindings.cc:78
+#: dselect/bindings.cc
 msgid "[not bound]"
 msgstr "[no asociada]"
 
-#: dselect/bindings.cc:82
+#: dselect/bindings.cc
 #, c-format
 msgid "[unk: %d]"
 msgstr "[desc: %d]"
 
-#: dselect/bindings.cc:141
+#: dselect/bindings.cc
 msgid "Scroll onwards through help/information"
 msgstr "Avanza a través de la ayuda/información"
 
-#: dselect/bindings.cc:142
+#: dselect/bindings.cc
 msgid "Scroll backwards through help/information"
 msgstr "Retrocede a través de la ayuda/información"
 
-#: dselect/bindings.cc:143
+#: dselect/bindings.cc
 msgid "Move up"
 msgstr "Subir"
 
-#: dselect/bindings.cc:144
+#: dselect/bindings.cc
 msgid "Move down"
 msgstr "Bajar"
 
-#: dselect/bindings.cc:145
+#: dselect/bindings.cc
 msgid "Go to top of list"
 msgstr "Ir al principio de la lista"
 
-#: dselect/bindings.cc:146
+#: dselect/bindings.cc
 msgid "Go to end of list"
 msgstr "Ir al final de la lista"
 
-#: dselect/bindings.cc:147
+#: dselect/bindings.cc
 msgid "Request help (cycle through help screens)"
 msgstr "Solicitar ayuda (evoluciona a través de las páginas de ayuda)"
 
-#: dselect/bindings.cc:148
+#: dselect/bindings.cc
 msgid "Cycle through information displays"
 msgstr "Evoluciona a través de las pantallas de información"
 
-#: dselect/bindings.cc:149
+#: dselect/bindings.cc
 msgid "Redraw display"
 msgstr "Redibuja la pantalla"
 
-#: dselect/bindings.cc:150
+#: dselect/bindings.cc
 msgid "Scroll onwards through list by 1 line"
 msgstr "Avanza a través de la lista en 1 línea"
 
-#: dselect/bindings.cc:151
+#: dselect/bindings.cc
 msgid "Scroll backwards through list by 1 line"
 msgstr "Retrocede a través de la lista en 1 línea"
 
-#: dselect/bindings.cc:152
+#: dselect/bindings.cc
 msgid "Scroll onwards through help/information by 1 line"
 msgstr "Avanza a través de la ayuda/información en 1 línea"
 
-#: dselect/bindings.cc:153
+#: dselect/bindings.cc
 msgid "Scroll backwards through help/information by 1 line"
 msgstr "Retrocede a través de la ayuda/información en 1 línea"
 
-#: dselect/bindings.cc:154
+#: dselect/bindings.cc
 msgid "Scroll onwards through list"
 msgstr "Avanza a través de la lista"
 
-#: dselect/bindings.cc:155
+#: dselect/bindings.cc
 msgid "Scroll backwards through list"
 msgstr "Retrocede a través de la lista"
 
-#: dselect/bindings.cc:158
+#: dselect/bindings.cc
 msgid "Mark package(s) for installation"
 msgstr "Marca el/los paquete(s) para instalación"
 
-#: dselect/bindings.cc:159
+#: dselect/bindings.cc
 msgid "Mark package(s) for deinstallation"
 msgstr "Marca el/los paquete(s) para desinstalación"
 
-#: dselect/bindings.cc:160
+#: dselect/bindings.cc
 msgid "Mark package(s) for deinstall and purge"
 msgstr "Marca el/los paquete(s) para desinstalar y purgar"
 
-#: dselect/bindings.cc:161
+#: dselect/bindings.cc
 msgid "Make highlight more specific"
 msgstr "Hace el realce más específico"
 
-#: dselect/bindings.cc:162
+#: dselect/bindings.cc
 msgid "Make highlight less specific"
 msgstr "Hace el realce menos específico"
 
-#: dselect/bindings.cc:163
+#: dselect/bindings.cc
 msgid "Search for a package whose name contains a string"
 msgstr "Busca un paquete cuyo nombre contenga una cadena"
 
-#: dselect/bindings.cc:164
+#: dselect/bindings.cc
 msgid "Repeat last search"
 msgstr "Repite la última búsqueda"
 
-#: dselect/bindings.cc:165
+#: dselect/bindings.cc
 msgid "Swap sort order priority/section"
 msgstr "Intercambia el mecanismo de ordenación prioridad/sección"
 
-#: dselect/bindings.cc:166
+#: dselect/bindings.cc
 msgid "Quit, confirming, and checking dependencies"
 msgstr "Salir, confirmando y comprobando dependencias"
 
-#: dselect/bindings.cc:167
+#: dselect/bindings.cc
 msgid "Quit, confirming without check"
 msgstr "Salir, confirmando y sin comprobar dependencias"
 
-#: dselect/bindings.cc:168
+#: dselect/bindings.cc
 msgid "Quit, rejecting conflict/dependency suggestions"
 msgstr "Salir, rechazando las sugerencias de conflictos/dependencias"
 
-#: dselect/bindings.cc:169
+#: dselect/bindings.cc
 msgid "Abort - quit without making changes"
 msgstr "Abortar - salir sin hacer ningún cambio"
 
-#: dselect/bindings.cc:170
+#: dselect/bindings.cc
 msgid "Revert to old state for all packages"
 msgstr "Poner el estado antiguo para todos los paquetes"
 
-#: dselect/bindings.cc:171
+#: dselect/bindings.cc
 msgid "Revert to suggested state for all packages"
 msgstr "Poner el estado sugerido para todos los paquetes"
 
-#: dselect/bindings.cc:172
+#: dselect/bindings.cc
 msgid "Revert to directly requested state for all packages"
 msgstr "Poner el estado directamente solicitado para todos los paquetes"
 
-#: dselect/bindings.cc:173
+#: dselect/bindings.cc
 msgid "Revert to currently installed state for all packages"
 msgstr "Poner el estado actualmente instalado para todos los paquetes"
 
-#: dselect/bindings.cc:176
+#: dselect/bindings.cc
 msgid "Select currently-highlighted access method"
 msgstr "Selecciona el método de acceso actualmente destacado"
 
-#: dselect/bindings.cc:177
+#: dselect/bindings.cc
 msgid "Quit without changing selected access method"
 msgstr "Salir sin cambiar el método de acceso seleccionado"
 
-#: dselect/helpmsgs.cc:29
+#: dselect/helpmsgs.cc
 msgid "Keystrokes"
 msgstr "Pulsaciones"
 
-#: dselect/helpmsgs.cc:29
+#: dselect/helpmsgs.cc
 msgid ""
 "Motion keys: Next/Previous, Top/End, Up/Down, Backwards/Forwards:\n"
 "  j, Down-arrow         k, Up-arrow             move highlight\n"
@@ -393,11 +393,11 @@ msgstr ""
 "  D      lo pone todo al estado Directamente solicitado\n"
 "                                           n, \\  repite la última búsqueda\n"
 
-#: dselect/helpmsgs.cc:55
+#: dselect/helpmsgs.cc
 msgid "Introduction to package selections"
 msgstr "Introducción a la selección de paquetes"
 
-#: dselect/helpmsgs.cc:55
+#: dselect/helpmsgs.cc
 msgid ""
 "Welcome to dselect's main package listing.\n"
 "\n"
@@ -453,11 +453,11 @@ msgstr ""
 "\n"
 "Pulse <espacio> para salir de la ayuda y entrar en la lista ahora.\n"
 
-#: dselect/helpmsgs.cc:80
+#: dselect/helpmsgs.cc
 msgid "Introduction to read-only package list browser"
 msgstr "Introducción al navegador de lista de paquetes de sólo lectura"
 
-#: dselect/helpmsgs.cc:80
+#: dselect/helpmsgs.cc
 msgid ""
 "Welcome to dselect's main package listing.\n"
 "\n"
@@ -496,11 +496,11 @@ msgstr ""
 "\n"
 "Pulse <espacio> para abandonar la ayuda y entrar en la lista.\n"
 
-#: dselect/helpmsgs.cc:99
+#: dselect/helpmsgs.cc
 msgid "Introduction to conflict/dependency resolution sub-list"
 msgstr "Introducción a la sublista de resolución de conflicto/dependencia"
 
-#: dselect/helpmsgs.cc:99
+#: dselect/helpmsgs.cc
 msgid ""
 "Dependency/conflict resolution - introduction.\n"
 "\n"
@@ -568,11 +568,11 @@ msgstr ""
 "Pulse <espacio> para abandonar la ayuda y entrar en la sublista;\n"
 "recuerde: pulse `?' para la ayuda.\n"
 
-#: dselect/helpmsgs.cc:125
+#: dselect/helpmsgs.cc
 msgid "Display, part 1: package listing and status chars"
 msgstr "Muestra, parte 1: listado de paquete y caracteres de estado"
 
-#: dselect/helpmsgs.cc:125
+#: dselect/helpmsgs.cc
 msgid ""
 "The top half of the screen shows a list of packages.  For each package you "
 "see\n"
@@ -637,11 +637,11 @@ msgstr ""
 "e instalada de cada paquete (Mayús-V para mostrar/esconder) y descripción\n"
 "resumida.\n"
 
-#: dselect/helpmsgs.cc:152
+#: dselect/helpmsgs.cc
 msgid "Display, part 2: list highlight; information display"
 msgstr "Muestra, parte 2: destacado de la lista; muestra de información"
 
-#: dselect/helpmsgs.cc:152
+#: dselect/helpmsgs.cc
 msgid ""
 "* Highlight: One line in the package list will be highlighted.  It "
 "indicates\n"
@@ -694,11 +694,11 @@ msgstr ""
 "  esconder la muestra de información o expandirla para utilizar casi toda\n"
 "  la pantalla.\n"
 
-#: dselect/helpmsgs.cc:176
+#: dselect/helpmsgs.cc
 msgid "Introduction to method selection display"
 msgstr "Introducción a la muestra de selección de método"
 
-#: dselect/helpmsgs.cc:176
+#: dselect/helpmsgs.cc
 msgid ""
 "dselect and dpkg can do automatic installation, loading the package files to "
 "be\n"
@@ -742,11 +742,11 @@ msgstr ""
 "al\n"
 "pulsar `k', o desde el menú de ayuda al que se accede pulsando `?'.\n"
 
-#: dselect/helpmsgs.cc:196
+#: dselect/helpmsgs.cc
 msgid "Keystrokes for method selection"
 msgstr "Teclas para la selección de método"
 
-#: dselect/helpmsgs.cc:196
+#: dselect/helpmsgs.cc
 msgid ""
 "Motion keys: Next/Previous, Top/End, Up/Down, Backwards/Forwards:\n"
 "  j, Down-arrow         k, Up-arrow             move highlight\n"
@@ -800,105 +800,105 @@ msgstr ""
 "  /              buscar (simplemente pulse Intro para cancelar)\n"
 "  \\              repetir la última búsqueda\n"
 
-#: dselect/main.cc:63
+#: dselect/main.cc
 msgid "Type dselect --help for help."
 msgstr "Escriba dselect --help para obtener ayuda."
 
-#: dselect/main.cc:145
+#: dselect/main.cc
 msgid "a"
 msgstr "m"
 
 # Pongo método y no acceso porque la "A" está ya cogida para Actualizar. sv
-#: dselect/main.cc:145
+#: dselect/main.cc
 msgid "[A]ccess"
 msgstr "[M]étodo"
 
-#: dselect/main.cc:145
+#: dselect/main.cc
 msgid "Choose the access method to use."
 msgstr "Escoger el método de acceso que se usará."
 
-#: dselect/main.cc:146
+#: dselect/main.cc
 msgid "u"
 msgstr "a"
 
-#: dselect/main.cc:146
+#: dselect/main.cc
 msgid "[U]pdate"
 msgstr "[A]ctualizar"
 
-#: dselect/main.cc:146
+#: dselect/main.cc
 msgid "Update list of available packages, if possible."
 msgstr "Actualizar la lista de paquetes disponibles, si se puede."
 
-#: dselect/main.cc:147
+#: dselect/main.cc
 msgid "s"
 msgstr "s"
 
-#: dselect/main.cc:147
+#: dselect/main.cc
 msgid "[S]elect"
 msgstr "[S]eleccionar"
 
-#: dselect/main.cc:147
+#: dselect/main.cc
 msgid "Request which packages you want on your system."
 msgstr "Solicitar qué paquetes desea en el sistema."
 
-#: dselect/main.cc:148
+#: dselect/main.cc
 msgid "i"
 msgstr "i"
 
-#: dselect/main.cc:148
+#: dselect/main.cc
 msgid "[I]nstall"
 msgstr "[I]nstalar"
 
-#: dselect/main.cc:148
+#: dselect/main.cc
 msgid "Install and upgrade wanted packages."
 msgstr "Instalar y actualizar los paquetes deseados."
 
-#: dselect/main.cc:149
+#: dselect/main.cc
 msgid "c"
 msgstr "c"
 
-#: dselect/main.cc:149
+#: dselect/main.cc
 msgid "[C]onfig"
 msgstr "[C]onfigurar"
 
-#: dselect/main.cc:149
+#: dselect/main.cc
 msgid "Configure any packages that are unconfigured."
 msgstr "Configurar los paquetes que no estén configurados."
 
-#: dselect/main.cc:150
+#: dselect/main.cc
 msgid "r"
 msgstr "d"
 
-#: dselect/main.cc:150
+#: dselect/main.cc
 msgid "[R]emove"
 msgstr "[D]esinstalar"
 
-#: dselect/main.cc:150
+#: dselect/main.cc
 msgid "Remove unwanted software."
 msgstr "Desinstalar los paquetes no deseados."
 
-#: dselect/main.cc:151
+#: dselect/main.cc
 msgid "q"
 msgstr "l"
 
-#: dselect/main.cc:151
+#: dselect/main.cc
 msgid "[Q]uit"
 msgstr "sa[L]ir"
 
-#: dselect/main.cc:151
+#: dselect/main.cc
 msgid "Quit dselect."
 msgstr "Salir de dselect."
 
-#: dselect/main.cc:152
+#: dselect/main.cc
 msgid "menu"
 msgstr "menú"
 
-#: dselect/main.cc:157
+#: dselect/main.cc
 #, c-format
 msgid "Debian `%s' package handling frontend version %s.\n"
 msgstr "Interfaz de manejo de paquetes %s de Debian `%s'.\n"
 
-#: dselect/main.cc:160
+#: dselect/main.cc
 msgid ""
 "This is free software; see the GNU General Public License version 2 or\n"
 "later for copying conditions. There is NO warranty.\n"
@@ -906,29 +906,47 @@ msgstr ""
 "Esto es software libre; vea la Licencia Pública General de GNU versión 2 o\n"
 "posterior para las condiciones de copia. No hay NINGUNA garantía.\n"
 
-#: dselect/main.cc:169 dselect/main.cc:217
+#: dselect/main.cc
 msgid "<standard output>"
 msgstr "<salida estándar>"
 
-#: dselect/main.cc:180
-#, c-format
+#: dselect/main.cc
+#, fuzzy, c-format
+#| msgid ""
+#| "Usage: %s [<option> ...] [<action> ...]\n"
+#| "\n"
 msgid ""
-"Usage: %s [<option> ...] [<action> ...]\n"
+"Usage: %s [<option>...] [<command>...]\n"
 "\n"
 msgstr ""
 "Modo de uso: %s [<opción> ...] [<acción> ...]\n"
 "\n"
 
-#: dselect/main.cc:184
+#: dselect/main.cc
 #, c-format
+msgid "Commands:\n"
+msgstr ""
+
+#: dselect/main.cc
+#, fuzzy, c-format
+#| msgid ""
+#| "Options:\n"
+#| "  --admindir <directory>     Use <directory> instead of %s.\n"
+#| "  --expert                   Turn on expert mode.\n"
+#| "  --debug <file> | -D<file>  Turn on debugging, sending output to "
+#| "<file>.\n"
+#| "  --colour | --color screenpart:[foreground],[background][:attr[+attr"
+#| "+...]]\n"
+#| "                             Configure screen colours.\n"
+#| "\n"
 msgid ""
 "Options:\n"
-"  --admindir <directory>     Use <directory> instead of %s.\n"
-"  --expert                   Turn on expert mode.\n"
-"  --debug <file> | -D<file>  Turn on debugging, sending output to <file>.\n"
-"  --colour | --color screenpart:[foreground],[background][:attr[+attr+...]]\n"
-"                             Configure screen colours.\n"
-"\n"
+"      --admindir <directory>       Use <directory> instead of %s.\n"
+"      --expert                     Turn on expert mode.\n"
+"  -D, --debug <file>               Turn on debugging, send output to "
+"<file>.\n"
+"      --color <color-spec>         Configure screen colors.\n"
+"      --colour <color-spec>        Ditto.\n"
 msgstr ""
 "Ociones:\n"
 "  --admindir <directorio>          Utiliza <directorio> en lugar de %s.\n"
@@ -940,72 +958,79 @@ msgstr ""
 "                                   Configura los colores de la pantalla.\n"
 "\n"
 
-#: dselect/main.cc:193
-#, c-format
+#: dselect/main.cc
+#, fuzzy, c-format
+#| msgid ""
+#| "  --help                     Show this help message.\n"
+#| "  --version                  Show the version.\n"
+#| "\n"
 msgid ""
-"  --help                     Show this help message.\n"
-"  --version                  Show the version.\n"
+"  -?, --help                       Show this help message.\n"
+"      --version                    Show the version.\n"
 "\n"
 msgstr ""
 "  --help                       Muestra este mensaje de ayuda.\n"
 "  --version                    Muestra la versión.\n"
 "\n"
 
-#: dselect/main.cc:197
+#: dselect/main.cc
 #, c-format
-msgid "Actions:\n"
-msgstr "Acciones:\n"
+msgid ""
+"<color-spec> is <screen-part>:[<foreground>],[<background>][:"
+"<attr>[+<attr>]...]\n"
+msgstr ""
 
-#: dselect/main.cc:202
-#, c-format
-msgid "Screenparts:\n"
+#: dselect/main.cc
+#, fuzzy, c-format
+#| msgid "Screenparts:\n"
+msgid "<screen-part> is:"
 msgstr "Partes de pantalla:\n"
 
-#: dselect/main.cc:207
+#: dselect/main.cc
 #, c-format
-msgid "Colours:\n"
-msgstr "Colores:\n"
+msgid "<color> is:"
+msgstr ""
 
-#: dselect/main.cc:212
+#: dselect/main.cc
 #, c-format
-msgid "Attributes:\n"
-msgstr "Atributos:\n"
+msgid "<attr> is:"
+msgstr ""
 
-#: dselect/main.cc:232
+#: dselect/main.cc
 #, c-format
 msgid "couldn't open debug file `%.255s'\n"
 msgstr "no se puede abrir el fichero de depuración `%.255s'\n"
 
-#: dselect/main.cc:253
+#: dselect/main.cc
 #, c-format
 msgid "invalid %s '%s'"
 msgstr "%s inválido `%s'"
 
-#: dselect/main.cc:272
+#: dselect/main.cc
 msgid "screen part"
 msgstr "parte de pantalla"
 
-#: dselect/main.cc:278
+#: dselect/main.cc
 msgid "null colour specification"
 msgstr "Especificación de color nula"
 
-#: dselect/main.cc:286 dselect/main.cc:291
+#: dselect/main.cc
 msgid "colour"
 msgstr "color"
 
-#: dselect/main.cc:299
+#: dselect/main.cc
 msgid "colour attribute"
 msgstr "atributo de color"
 
-#: dselect/main.cc:333
+#: dselect/main.cc
 msgid "Terminal does not appear to support cursor addressing.\n"
 msgstr "El terminal no parece dar soporte al direccionamiento por cursor.\n"
 
-#: dselect/main.cc:335
+#: dselect/main.cc
 msgid "Terminal does not appear to support highlighting.\n"
 msgstr "El terminal parece no dar soporte al destacado.\n"
 
-#: dselect/main.cc:337
+#: dselect/main.cc
 #, c-format
 msgid ""
 "Set your TERM variable correctly, use a better terminal,\n"
@@ -1014,11 +1039,11 @@ msgstr ""
 "Establezca la variable TERM correctamente, utilice un terminal mejor,\n"
 "o manéjese con la herramienta de gestión por paquete %s.\n"
 
-#: dselect/main.cc:340
+#: dselect/main.cc
 msgid "terminal lacks necessary features, giving up"
 msgstr "el terminal carece de propiedades necesarias: abandonando"
 
-#: dselect/main.cc:425
+#: dselect/main.cc
 msgid ""
 "\n"
 "\n"
@@ -1032,7 +1057,7 @@ msgstr ""
 "Pulse <intro> para confirmar la selección.  ^L redibuja la pantalla.\n"
 "\n"
 
-#: dselect/main.cc:430
+#: dselect/main.cc
 msgid ""
 "Copyright (C) 1994-1996 Ian Jackson.\n"
 "Copyright (C) 2000,2001 Wichert Akkerman.\n"
@@ -1040,7 +1065,7 @@ msgstr ""
 "Copyright (C) 1994-1996 Ian Jackson.\n"
 "Copyright (C) 2000,2001 Wichert Akkerman.\n"
 
-#: dselect/main.cc:436
+#: dselect/main.cc
 msgid ""
 "\n"
 "\n"
@@ -1050,60 +1075,60 @@ msgstr ""
 "\n"
 "Acceso de sólo lectura: ¡solamente se pueden ver las selecciones!"
 
-#: dselect/main.cc:455
+#: dselect/main.cc
 msgid "failed to getch in main menu"
 msgstr "fallo en getch en el menú principal"
 
-#: dselect/main.cc:538
+#: dselect/main.cc
 #, c-format
 msgid "unknown action string `%.50s'"
 msgstr "cadena de acción desconocida `%.50s'"
 
-#: dselect/methlist.cc:66
+#: dselect/methlist.cc
 msgid "Abbrev."
 msgstr "Abrev."
 
-#: dselect/methlist.cc:67 dselect/pkgdisplay.cc:188 dselect/pkginfo.cc:110
+#: dselect/methlist.cc dselect/pkgdisplay.cc dselect/pkginfo.cc
 msgid "Description"
 msgstr "Descripción"
 
-#: dselect/methlist.cc:73
+#: dselect/methlist.cc
 msgid "dselect - list of access methods"
 msgstr "dselect - lista de métodos de acceso"
 
-#: dselect/methlist.cc:82
+#: dselect/methlist.cc
 #, c-format
 msgid "Access method `%s'."
 msgstr "Método de acceso `%s'."
 
-#: dselect/methlist.cc:161 dselect/pkglist.cc:587
+#: dselect/methlist.cc dselect/pkglist.cc
 msgid "doupdate failed"
 msgstr "`doupdate' falló"
 
-#: dselect/methlist.cc:164 dselect/pkglist.cc:590
+#: dselect/methlist.cc dselect/pkglist.cc
 msgid "failed to unblock SIGWINCH"
 msgstr "fallo al desbloquear SIGWINCH"
 
-#: dselect/methlist.cc:169 dselect/pkglist.cc:595
+#: dselect/methlist.cc dselect/pkglist.cc
 msgid "failed to re-block SIGWINCH"
 msgstr "fallo al rebloquear SIGWINCH"
 
-#: dselect/methlist.cc:170 dselect/pkglist.cc:597
+#: dselect/methlist.cc dselect/pkglist.cc
 msgid "getch failed"
 msgstr "getch falló"
 
-#: dselect/methlist.cc:187
+#: dselect/methlist.cc
 msgid "Explanation"
 msgstr "Explicación"
 
-#: dselect/methlist.cc:197
+#: dselect/methlist.cc
 msgid "No explanation available."
 msgstr "No hay explicación disponible."
 
 # FIXME: May not be translated properly without context.
 # Or else: Does not need to be translated.
 # It seems first %s is "dselect", second %s is an error message. sv
-#: dselect/method.cc:67
+#: dselect/method.cc
 #, c-format
 msgid ""
 "\n"
@@ -1114,7 +1139,7 @@ msgstr ""
 "\n"
 "%s: %s\n"
 
-#: dselect/method.cc:70
+#: dselect/method.cc
 msgid ""
 "\n"
 "Press <enter> to continue."
@@ -1122,193 +1147,203 @@ msgstr ""
 "\n"
 "Pulse <intro> para continuar."
 
-#: dselect/method.cc:82
+#: dselect/method.cc
 msgid "cannot unlock access method area"
 msgstr "no se puede desbloquear el área de acceso del método"
 
-#: dselect/method.cc:96
+#: dselect/method.cc
 msgid "no access methods are available"
 msgstr "no hay métodos de acceso disponibles"
 
-#: dselect/method.cc:115
+#: dselect/method.cc
 msgid "requested operation requires superuser privilege"
 msgstr "la operación solicitada requiere privilegios de superusuario"
 
-#: dselect/method.cc:118
+#: dselect/method.cc
 msgid "cannot open or create access method lockfile"
 msgstr "no se puede abrir o crear el fichero de bloqueo del método de acceso"
 
-#: dselect/method.cc:125
+#: dselect/method.cc
 msgid "the access method area is already locked"
 msgstr "el área del método de acceso ya está bloqueada"
 
-#: dselect/method.cc:128
+#: dselect/method.cc
 msgid "cannot lock access method area"
 msgstr "no se puede bloquear el área del método de acceso"
 
-#: dselect/method.cc:161
+#: dselect/method.cc
 #, c-format
 msgid "Press <enter> to continue.\n"
 msgstr "Pulse <intro> para continuar.\n"
 
-#: dselect/method.cc:162
+#: dselect/method.cc
 msgid "<standard error>"
 msgstr "<error estándar>"
 
-#: dselect/method.cc:165
+#: dselect/method.cc
 msgid "error reading acknowledgement of program failure message"
 msgstr "error al leer reconocimiento del mensaje de fallo del programa"
 
-#: dselect/method.cc:187
+#: dselect/method.cc
 msgid "no access method is selected or configured"
 msgstr "no se ha seleccionado o configurado un método de acceso"
 
 # Pongo "el" porque es comienzo de una frase que termina por ejemplo
 # como "... devolvió el código de error %d". sv
-#: dselect/method.cc:196
+#: dselect/method.cc
 msgid "update available list script"
 msgstr "el script de actualización de la lista `available'"
 
-#: dselect/method.cc:200
+#: dselect/method.cc
 msgid "installation script"
 msgstr "el script de instalación"
 
-#: dselect/method.cc:246
+#: dselect/method.cc
 msgid "query/setup script"
 msgstr "el script de petición/configuración"
 
-#: dselect/methparse.cc:53
+#: dselect/methparse.cc
 #, c-format
 msgid "syntax error in method options file `%.250s' -- %s"
 msgstr "error de sintaxis en el fichero de opciones del método `%.250s' -- %s"
 
-#: dselect/methparse.cc:59
+#: dselect/methparse.cc
 #, c-format
 msgid "error reading options file `%.250s'"
 msgstr "error al leer el fichero de opciones `%.250s'"
 
-#: dselect/methparse.cc:93
+#: dselect/methparse.cc
 #, c-format
 msgid "unable to read `%.250s' directory for reading methods"
 msgstr "no se puede leer el directorio `%.250s' para leer los métodos"
 
-#: dselect/methparse.cc:109
+#: dselect/methparse.cc
 #, c-format
 msgid "method `%.250s' has name that is too long (%d > %d characters)"
 msgstr ""
 "el método `%.250s'\n"
 "tiene un nombre demasiado largo (%d > %d caracteres)"
 
-#: dselect/methparse.cc:120
+#: dselect/methparse.cc
 #, c-format
 msgid "unable to access method script `%.250s'"
 msgstr "no se puede acceder al script del método `%.250s'"
 
-#: dselect/methparse.cc:126
+#: dselect/methparse.cc
 #, c-format
 msgid "unable to read method options file `%.250s'"
 msgstr "no se puede leer el fichero de opciones del método `%.250s'"
 
-#: dselect/methparse.cc:150
+#: dselect/methparse.cc
 msgid "non-digit where digit wanted"
 msgstr "se encontró un no dígito cuando se esperaba un dígito"
 
-#: dselect/methparse.cc:153
-msgid "EOF in index string"
+#: dselect/methparse.cc
+#, fuzzy
+#| msgid "EOF in index string"
+msgid "end of file in index string"
 msgstr "EOF en la cadena de índice"
 
-#: dselect/methparse.cc:156
+#: dselect/methparse.cc
 msgid "index string too long"
 msgstr "cadena de índice demasiado larga"
 
-#: dselect/methparse.cc:159
+#: dselect/methparse.cc
 msgid "newline before option name start"
 msgstr "nueva línea antes de que comience el nombre de la opción"
 
-#: dselect/methparse.cc:161
-msgid "EOF before option name start"
-msgstr "EOF antes de que comience el nombre de la opción"
+#: dselect/methparse.cc
+#, fuzzy
+#| msgid "newline before option name start"
+msgid "end of file before option name start"
+msgstr "nueva línea antes de que comience el nombre de la opción"
 
-#: dselect/methparse.cc:165
+#: dselect/methparse.cc
 msgid "nonalpha where option name start wanted"
 msgstr ""
 "carácter no alfanumérico donde se esperaba el comienzo del nombre de una "
 "opción"
 
-#: dselect/methparse.cc:167
+#: dselect/methparse.cc
 msgid "non-alphanum in option name"
 msgstr "carácter no alfanumérico en el nombre de opción"
 
-#: dselect/methparse.cc:170
-msgid "EOF in option name"
+#: dselect/methparse.cc
+#, fuzzy
+#| msgid "EOF in option name"
+msgid "end of file in option name"
 msgstr "EOF dentro del nombre de la opción"
 
-#: dselect/methparse.cc:175
+#: dselect/methparse.cc
 msgid "newline before summary"
 msgstr "nueva línea antes del resumen"
 
-#: dselect/methparse.cc:177
-msgid "EOF before summary"
-msgstr "EOF antes del resumen"
+#: dselect/methparse.cc
+#, fuzzy
+#| msgid "newline before summary"
+msgid "end of file before summary"
+msgstr "nueva línea antes del resumen"
 
-#: dselect/methparse.cc:183
-msgid "EOF in summary - missing newline"
+#: dselect/methparse.cc
+#, fuzzy
+#| msgid "EOF in summary - missing newline"
+msgid "end of file in summary - missing newline"
 msgstr "EOF en el resumen - falta una nueva línea"
 
-#: dselect/methparse.cc:193
+#: dselect/methparse.cc
 #, c-format
 msgid "unable to open option description file `%.250s'"
 msgstr "no se puede abrir el fichero de descripciones de opciones `%.250s'"
 
-#: dselect/methparse.cc:197
+#: dselect/methparse.cc
 #, c-format
 msgid "unable to stat option description file `%.250s'"
 msgstr ""
 "no se puede efectuar `stat' sobre el fichero de descripciones de opciones `"
 "%.250s'"
 
-#: dselect/methparse.cc:201
+#: dselect/methparse.cc
 #, c-format
 msgid "failed to read option description file `%.250s'"
 msgstr "fallo al leer el fichero de descripciones de opciones `%.250s'"
 
-#: dselect/methparse.cc:204
+#: dselect/methparse.cc
 #, c-format
 msgid "error during read of option description file `%.250s'"
 msgstr "error al leer el fichero de descripción de opciones `%.250s'"
 
-#: dselect/methparse.cc:227
+#: dselect/methparse.cc
 #, c-format
 msgid "error during read of method options file `%.250s'"
 msgstr "error al leer el fichero de opciones del método `%.250s'"
 
-#: dselect/methparse.cc:250
+#: dselect/methparse.cc
 #, c-format
 msgid "unable to open current option file `%.250s'"
 msgstr "no se puede abrir el fichero de opciones actual `%.250s'"
 
-#: dselect/methparse.cc:286
+#: dselect/methparse.cc
 #, c-format
 msgid "unable to write new option to `%.250s'"
 msgstr "no se puede escribir nueva opción en `%.250s'"
 
-#: dselect/pkgdisplay.cc:36
+#: dselect/pkgdisplay.cc
 msgid "new package"
 msgstr "nuevo paquete"
 
-#: dselect/pkgdisplay.cc:37
+#: dselect/pkgdisplay.cc
 msgid "install"
 msgstr "instalar"
 
-#: dselect/pkgdisplay.cc:38
+#: dselect/pkgdisplay.cc
 msgid "hold"
 msgstr "mantener"
 
-#: dselect/pkgdisplay.cc:39
+#: dselect/pkgdisplay.cc
 msgid "remove"
 msgstr "desinstalar"
 
-#: dselect/pkgdisplay.cc:40
+#: dselect/pkgdisplay.cc
 msgid "purge"
 msgstr "purgar"
 
@@ -1317,328 +1352,322 @@ msgstr "purgar"
 #. * the empty string to store information about the translation. DO NOT
 #. * CHANGE THAT IN A TRANSLATION! The code really relies on that being
 #. * a single space.
-#: dselect/pkgdisplay.cc:47
+#: dselect/pkgdisplay.cc
 msgid " "
 msgstr " "
 
-#: dselect/pkgdisplay.cc:48
+#: dselect/pkgdisplay.cc
 msgid "REINSTALL"
 msgstr "REINSTALAR"
 
-#: dselect/pkgdisplay.cc:51
+#: dselect/pkgdisplay.cc
 msgid "not installed"
 msgstr "no instalado"
 
-#: dselect/pkgdisplay.cc:52
+#: dselect/pkgdisplay.cc
 msgid "removed (configs remain)"
 msgstr "desinstalado (queda su configuración)"
 
-#: dselect/pkgdisplay.cc:53
+#: dselect/pkgdisplay.cc
 msgid "half installed"
 msgstr "instalado a medias"
 
-#: dselect/pkgdisplay.cc:54
+#: dselect/pkgdisplay.cc
 msgid "unpacked (not set up)"
 msgstr "desempaquetado (no configurado)"
 
-#: dselect/pkgdisplay.cc:55
+#: dselect/pkgdisplay.cc
 msgid "half configured (config failed)"
 msgstr "medio configurado (falló la configuración)"
 
-#: dselect/pkgdisplay.cc:56
+#: dselect/pkgdisplay.cc
 msgid "awaiting trigger processing"
 msgstr "esperando al procesado de los disparadores"
 
-#: dselect/pkgdisplay.cc:57
+#: dselect/pkgdisplay.cc
 msgid "triggered"
 msgstr "disparadores ejecutados"
 
-#: dselect/pkgdisplay.cc:58
+#: dselect/pkgdisplay.cc
 msgid "installed"
 msgstr "instalado"
 
-#: dselect/pkgdisplay.cc:61
+#: dselect/pkgdisplay.cc
 msgid "Required"
 msgstr "requeridos"
 
-#: dselect/pkgdisplay.cc:62
+#: dselect/pkgdisplay.cc
 msgid "Important"
 msgstr "importantes"
 
-#: dselect/pkgdisplay.cc:63
+#: dselect/pkgdisplay.cc
 msgid "Standard"
 msgstr "estándar"
 
-#: dselect/pkgdisplay.cc:64
+#: dselect/pkgdisplay.cc
 msgid "Optional"
 msgstr "opcionales"
 
-#: dselect/pkgdisplay.cc:65
+#: dselect/pkgdisplay.cc
 msgid "Extra"
 msgstr "extra"
 
-#: dselect/pkgdisplay.cc:66
-msgid "!Bug!"
-msgstr "¡Bicho!"
-
-#: dselect/pkgdisplay.cc:67
+#: dselect/pkgdisplay.cc
 msgid "Unclassified"
 msgstr "sin clasificar"
 
-#: dselect/pkgdisplay.cc:70
+#: dselect/pkgdisplay.cc
 msgid "suggests"
 msgstr "sugiere"
 
-#: dselect/pkgdisplay.cc:71
+#: dselect/pkgdisplay.cc
 msgid "recommends"
 msgstr "recomienda"
 
-#: dselect/pkgdisplay.cc:72
+#: dselect/pkgdisplay.cc
 msgid "depends on"
 msgstr "depende de"
 
-#: dselect/pkgdisplay.cc:73
+#: dselect/pkgdisplay.cc
 msgid "pre-depends on"
 msgstr "predepende de"
 
-#: dselect/pkgdisplay.cc:74
+#: dselect/pkgdisplay.cc
 msgid "breaks"
 msgstr "rompe"
 
-#: dselect/pkgdisplay.cc:75
+#: dselect/pkgdisplay.cc
 msgid "conflicts with"
 msgstr "entra en conflicto con"
 
-#: dselect/pkgdisplay.cc:76
+#: dselect/pkgdisplay.cc
 msgid "provides"
 msgstr "provee"
 
-#: dselect/pkgdisplay.cc:77
+#: dselect/pkgdisplay.cc
 msgid "replaces"
 msgstr "reemplaza a"
 
-#: dselect/pkgdisplay.cc:78
+#: dselect/pkgdisplay.cc
 msgid "enhances"
 msgstr "amplía"
 
-#: dselect/pkgdisplay.cc:81
+#: dselect/pkgdisplay.cc
 msgid "Req"
 msgstr "Req"
 
-#: dselect/pkgdisplay.cc:82
+#: dselect/pkgdisplay.cc
 msgid "Imp"
 msgstr "Imp"
 
-#: dselect/pkgdisplay.cc:83
+#: dselect/pkgdisplay.cc
 msgid "Std"
 msgstr "Est"
 
-#: dselect/pkgdisplay.cc:84
+#: dselect/pkgdisplay.cc
 msgid "Opt"
 msgstr "Opc"
 
-#: dselect/pkgdisplay.cc:85
+#: dselect/pkgdisplay.cc
 msgid "Xtr"
 msgstr "Ext"
 
-#: dselect/pkgdisplay.cc:86
+#: dselect/pkgdisplay.cc
 msgid "bUG"
 msgstr "bICHO"
 
-#: dselect/pkgdisplay.cc:87
+#: dselect/pkgdisplay.cc
 msgid "?"
 msgstr "¿?"
 
-#: dselect/pkgdisplay.cc:95 dselect/pkgdisplay.cc:115
+#: dselect/pkgdisplay.cc
 msgid "Broken"
 msgstr "rotos"
 
-#: dselect/pkgdisplay.cc:96
+#: dselect/pkgdisplay.cc
 msgid "New"
 msgstr "nuevos"
 
-#: dselect/pkgdisplay.cc:97
-msgid "Updated"
-msgstr "con actualización disponible"
+#: dselect/pkgdisplay.cc
+msgid "Upgradable"
+msgstr ""
 
-#: dselect/pkgdisplay.cc:98
+#: dselect/pkgdisplay.cc
 msgid "Obsolete/local"
 msgstr "obsoletos/locales"
 
-#: dselect/pkgdisplay.cc:99
-msgid "Up-to-date"
-msgstr "actualizados"
+#: dselect/pkgdisplay.cc
+msgid "Installed"
+msgstr "Instalados"
 
-#: dselect/pkgdisplay.cc:100
+#: dselect/pkgdisplay.cc
 msgid "Available"
 msgstr "disponibles"
 
-#: dselect/pkgdisplay.cc:101 dselect/pkgdisplay.cc:117
+#: dselect/pkgdisplay.cc
 msgid "Removed"
 msgstr "Desinstalados"
 
-#: dselect/pkgdisplay.cc:102 dselect/pkgdisplay.cc:111
+#: dselect/pkgdisplay.cc
 msgid "Brokenly installed packages"
 msgstr "Paquetes mal instalados"
 
-#: dselect/pkgdisplay.cc:103
+#: dselect/pkgdisplay.cc
 msgid "Newly available packages"
 msgstr "Paquetes nuevos disponibles"
 
-#: dselect/pkgdisplay.cc:104
-msgid "Updated packages (newer version is available)"
-msgstr "Actualización disponible"
+#: dselect/pkgdisplay.cc
+#, fuzzy
+#| msgid "Newly available packages"
+msgid "Upgradable packages"
+msgstr "Paquetes nuevos disponibles"
 
-#: dselect/pkgdisplay.cc:105
-msgid "Obsolete and local packages present on system"
+#: dselect/pkgdisplay.cc
+#, fuzzy
+#| msgid "Obsolete and local packages present on system"
+msgid "Obsolete and locally created packages"
 msgstr "Paquetes obsoletos y localmente instalados"
 
-#: dselect/pkgdisplay.cc:106
-msgid "Up to date installed packages"
-msgstr "Paquetes actualizados, no hay versión más nueva"
+#: dselect/pkgdisplay.cc
+msgid "Installed packages"
+msgstr "Paquetes instalados"
 
-#: dselect/pkgdisplay.cc:107
-msgid "Available packages (not currently installed)"
-msgstr "Paquetes disponibles (no instalados actualmente)"
+#: dselect/pkgdisplay.cc
+#, fuzzy
+#| msgid "Up to date installed packages"
+msgid "Available not installed packages"
+msgstr "Paquetes actualizados, no hay versión más nueva"
 
-#: dselect/pkgdisplay.cc:108
+#: dselect/pkgdisplay.cc
 msgid "Removed and no longer available packages"
 msgstr "Paquetes desinstalados que ya no están disponibles"
 
-#: dselect/pkgdisplay.cc:112
-msgid "Installed packages"
-msgstr "Paquetes instalados"
-
-#: dselect/pkgdisplay.cc:113
+#: dselect/pkgdisplay.cc
 msgid "Removed packages (configuration still present)"
 msgstr "Paquetes desinstalados (queda la configuración)"
 
-#: dselect/pkgdisplay.cc:114
+#: dselect/pkgdisplay.cc
 msgid "Purged packages and those never installed"
 msgstr "Paquetes purgados o que nunca fueron instalados"
 
-#: dselect/pkgdisplay.cc:116
-msgid "Installed"
-msgstr "Instalados"
-
-#: dselect/pkgdisplay.cc:118
+#: dselect/pkgdisplay.cc
 msgid "Purged"
 msgstr "Purgados"
 
-#: dselect/pkgdisplay.cc:138
+#: dselect/pkgdisplay.cc
 msgid "Error"
 msgstr "Error"
 
-#: dselect/pkgdisplay.cc:139
+#: dselect/pkgdisplay.cc
 msgid "Installed?"
 msgstr "¿Instalado?"
 
-#: dselect/pkgdisplay.cc:140
+#: dselect/pkgdisplay.cc
 msgid "Old mark"
 msgstr "Marca antigua"
 
-#: dselect/pkgdisplay.cc:141
+#: dselect/pkgdisplay.cc
 msgid "Marked for"
 msgstr "Marcado para"
 
 # Habrá que mirarlo.
-#: dselect/pkgdisplay.cc:143
+#: dselect/pkgdisplay.cc
 msgid "EIOM"
 msgstr "EIOM"
 
-#: dselect/pkgdisplay.cc:147 dselect/pkgdisplay.cc:150
+#: dselect/pkgdisplay.cc
 msgid "Section"
 msgstr "Sección"
 
-#: dselect/pkgdisplay.cc:148
+#: dselect/pkgdisplay.cc
 msgid "Priority"
 msgstr "Prioridad"
 
-#: dselect/pkgdisplay.cc:152
+#: dselect/pkgdisplay.cc
 msgid "Package"
 msgstr "Paquete"
 
-#: dselect/pkgdisplay.cc:161 dselect/pkgdisplay.cc:165
+#: dselect/pkgdisplay.cc
 msgid "Avail.arch"
 msgstr "Arq.disp."
 
-#: dselect/pkgdisplay.cc:164
+#: dselect/pkgdisplay.cc
 msgid "Inst.arch"
 msgstr "Inst.arq."
 
-#: dselect/pkgdisplay.cc:178 dselect/pkgdisplay.cc:182
+#: dselect/pkgdisplay.cc
 msgid "Avail.ver"
 msgstr "Ver.disp."
 
-#: dselect/pkgdisplay.cc:181
+#: dselect/pkgdisplay.cc
 msgid "Inst.ver"
 msgstr "Ver.inst."
 
-#: dselect/pkgdisplay.cc:197
+#: dselect/pkgdisplay.cc
 msgid "dselect - recursive package listing"
 msgstr "dselect - lista recursiva de paquetes"
 
-#: dselect/pkgdisplay.cc:199
+#: dselect/pkgdisplay.cc
 msgid "dselect - inspection of package states"
 msgstr "dselect - inspección de los estados de los paquetes"
 
-#: dselect/pkgdisplay.cc:200
+#: dselect/pkgdisplay.cc
 msgid "dselect - main package listing"
 msgstr "dselect - lista principal de paquetes"
 
-#: dselect/pkgdisplay.cc:208
+#: dselect/pkgdisplay.cc
 msgid " (by section)"
 msgstr " (por sección)"
 
-#: dselect/pkgdisplay.cc:211
+#: dselect/pkgdisplay.cc
 msgid " (avail., section)"
 msgstr " (disp., sección)"
 
-#: dselect/pkgdisplay.cc:214
+#: dselect/pkgdisplay.cc
 msgid " (status, section)"
 msgstr " (estado, sección)"
 
-#: dselect/pkgdisplay.cc:223
+#: dselect/pkgdisplay.cc
 msgid " (by priority)"
 msgstr " (por prioridad)"
 
-#: dselect/pkgdisplay.cc:226
+#: dselect/pkgdisplay.cc
 msgid " (avail., priority)"
 msgstr " (disp., prioridad)"
 
-#: dselect/pkgdisplay.cc:229
+#: dselect/pkgdisplay.cc
 msgid " (status, priority)"
 msgstr " (estado, prioridad)"
 
-#: dselect/pkgdisplay.cc:238
+#: dselect/pkgdisplay.cc
 msgid " (alphabetically)"
 msgstr " (alfabéticamente)"
 
-#: dselect/pkgdisplay.cc:241
+#: dselect/pkgdisplay.cc
 msgid " (by availability)"
 msgstr " (por disponibilidad)"
 
-#: dselect/pkgdisplay.cc:244
+#: dselect/pkgdisplay.cc
 msgid " (by status)"
 msgstr " (por estado)"
 
-#: dselect/pkgdisplay.cc:259
+#: dselect/pkgdisplay.cc
 msgid " mark:+/=/- terse:v help:?"
 msgstr " marca:+/=/- conciso:v ayuda:?"
 
-#: dselect/pkgdisplay.cc:260
+#: dselect/pkgdisplay.cc
 msgid " mark:+/=/- verbose:v help:?"
 msgstr " marca:+/=/- literal:v ayuda:?"
 
-#: dselect/pkgdisplay.cc:262
+#: dselect/pkgdisplay.cc
 msgid " terse:v help:?"
 msgstr " conciso:v ayuda:?"
 
-#: dselect/pkgdisplay.cc:263
+#: dselect/pkgdisplay.cc
 msgid " verbose:v help:?"
 msgstr " literal:v ayuda:?"
 
-#: dselect/pkginfo.cc:85
+#: dselect/pkginfo.cc
 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 "
@@ -1658,80 +1687,110 @@ msgstr ""
 "Se puede usar `o' y `O' para cambiar el tipo de ordenación, esto permite\n"
 "marcar paquetes en distintos tipos de grupos."
 
-#: dselect/pkginfo.cc:98
+#: dselect/pkginfo.cc
 msgid "Interrelationships"
 msgstr "Interrelaciones"
 
-#: dselect/pkginfo.cc:117
+#: dselect/pkginfo.cc
 msgid "No description available."
 msgstr "No hay una descripción disponible."
 
-#: dselect/pkginfo.cc:135
+#: dselect/pkginfo.cc
 msgid "Installed control file information"
 msgstr "Información de control instalada"
 
-#: dselect/pkginfo.cc:151
+#: dselect/pkginfo.cc
 msgid "Available control file information"
 msgstr "Información disponible de control"
 
-#: dselect/pkglist.cc:425
+#: dselect/pkglist.cc
 msgid "there are no packages"
 msgstr "no hay paquetes"
 
-#: dselect/pkglist.cc:521
+#: dselect/pkglist.cc
 msgid "invalid search option given"
 msgstr "se ha dado una opción de búsqueda inválida"
 
-#: dselect/pkglist.cc:536
+#: dselect/pkglist.cc
 msgid "error in regular expression"
 msgstr "error en la expresión regular"
 
-#: dselect/pkgsublist.cc:111
+#: dselect/pkgsublist.cc
 msgid " does not appear to be available\n"
 msgstr " no parece estar disponible\n"
 
-#: dselect/pkgsublist.cc:131
+#: dselect/pkgsublist.cc
 msgid " or "
 msgstr " o "
 
-#: dselect/pkgtop.cc:58
+#: dselect/pkgtop.cc
 msgid "All"
 msgstr "Todos"
 
-#: dselect/pkgtop.cc:80
+#: dselect/pkgtop.cc
 msgid "All packages"
 msgstr "Todos los paquetes"
 
-#: dselect/pkgtop.cc:84
+#: dselect/pkgtop.cc
 #, c-format
 msgid "%s packages without a section"
 msgstr "%s paquetes sin sección"
 
-#: dselect/pkgtop.cc:86
+#: dselect/pkgtop.cc
 #, c-format
 msgid "%s packages in section %s"
 msgstr "%s paquetes en la sección %s"
 
-#: dselect/pkgtop.cc:92
+#: dselect/pkgtop.cc
 #, c-format
 msgid "%s %s packages"
 msgstr "Paquetes %s %s"
 
-#: dselect/pkgtop.cc:96
+#: dselect/pkgtop.cc
 #, c-format
 msgid "%s %s packages without a section"
 msgstr "Paquetes %s %s sin sección"
 
-#: dselect/pkgtop.cc:98
+#: dselect/pkgtop.cc
 #, c-format
 msgid "%s %s packages in section %s"
 msgstr "Paquetes %s %s en la sección %s"
 
-#: dselect/pkgtop.cc:119
+#: dselect/pkgtop.cc
 #, c-format
 msgid "%-*s %s%s%s;  %s (was: %s).  %s"
 msgstr "%-*s %s%s%s;  %s (era: %s).  %s"
 
+#~ msgid "Actions:\n"
+#~ msgstr "Acciones:\n"
+
+#~ msgid "Colours:\n"
+#~ msgstr "Colores:\n"
+
+#~ msgid "Attributes:\n"
+#~ msgstr "Atributos:\n"
+
+#~ msgid "EOF before option name start"
+#~ msgstr "EOF antes de que comience el nombre de la opción"
+
+#~ msgid "EOF before summary"
+#~ msgstr "EOF antes del resumen"
+
+#~ msgid "!Bug!"
+#~ msgstr "¡Bicho!"
+
+#~ msgid "Updated"
+#~ msgstr "con actualización disponible"
+
+#~ msgid "Up-to-date"
+#~ msgstr "actualizados"
+
+#~ msgid "Updated packages (newer version is available)"
+#~ msgstr "Actualización disponible"
+
+#~ msgid "Available packages (not currently installed)"
+#~ msgstr "Paquetes disponibles (no instalados actualmente)"
+
 #~ msgid "foreign architectures enabled but multi-arch is not supported"
 #~ msgstr ""
 #~ "se han activado arquitecturas foráneas pero no se soportan múltiples "
diff --git a/dselect/po/et.po b/dselect/po/et.po
index 29272e14a..9db2d8e4d 100644
--- a/dselect/po/et.po
+++ b/dselect/po/et.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dselect 1.14.5\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2014-12-23 18:12+0100\n"
+"POT-Creation-Date: 2015-04-06 09:37+0200\n"
 "PO-Revision-Date: 2007-07-13 08:22+0300\n"
 "Last-Translator: Ivar Smolin <okul@linux.ee>\n"
 "Language-Team: Estonian <et@li.org>\n"
@@ -19,28 +19,28 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: dselect/basecmds.cc:125
+#: dselect/basecmds.cc
 msgid "Search for ? "
 msgstr "Mida otsida ? "
 
-#: dselect/basecmds.cc:149
+#: dselect/basecmds.cc
 msgid "Error: "
 msgstr "Viga: "
 
-#: dselect/basecmds.cc:180
+#: dselect/basecmds.cc
 msgid "Help: "
 msgstr "Abi: "
 
-#: dselect/basecmds.cc:186
+#: dselect/basecmds.cc
 msgid "Press ? for help menu, . for next topic, <space> to exit help."
 msgstr ""
 "Abimenüü jaoks vajuta `?', järgmine teema: `.', abi sulgemine: <tühik>."
 
-#: dselect/basecmds.cc:193
+#: dselect/basecmds.cc
 msgid "Help information is available under the following topics:"
 msgstr "Abiteavet on võimalik saada järgnevate teemade kohta:"
 
-#: dselect/basecmds.cc:201
+#: dselect/basecmds.cc
 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. "
@@ -49,243 +49,243 @@ msgstr ""
 "  abiteabest väljumiseks klahve 'q' või <tühik> või abiteabe\n"
 "  lehthaaval lugemiseks klahvi `.'."
 
-#: dselect/basecmds.cc:207
+#: dselect/basecmds.cc
 msgid "error reading keyboard in help"
 msgstr "viga klaviatuurilt lugemisel (abiteabe ekraanil)"
 
-#: dselect/baselist.cc:60
+#: dselect/baselist.cc
 msgid "ioctl(TIOCGWINSZ) failed"
 msgstr "tõrge funktsioonis ioctl(TIOCGWINSZ)"
 
-#: dselect/baselist.cc:63
+#: dselect/baselist.cc
 msgid "doupdate in SIGWINCH handler failed"
 msgstr "tõrge signaali SIGWINCH käsitleja doupdate funktsioonis"
 
-#: dselect/baselist.cc:72
+#: dselect/baselist.cc
 msgid "failed to restore old SIGWINCH sigact"
 msgstr "tõrge signaali SIGWINCH vana sigact'i taastamisel"
 
-#: dselect/baselist.cc:75
+#: dselect/baselist.cc
 msgid "failed to restore old signal mask"
 msgstr "tõrge vana signaalimaski taastamisel"
 
-#: dselect/baselist.cc:86
+#: dselect/baselist.cc
 msgid "failed to get old signal mask"
 msgstr "tõrge vana signaalimaski hankimisel"
 
-#: dselect/baselist.cc:88
+#: dselect/baselist.cc
 msgid "failed to get old SIGWINCH sigact"
 msgstr "tõrge signaali SIGWINCH vana sigact'i hankimisel"
 
-#: dselect/baselist.cc:93
+#: dselect/baselist.cc
 msgid "failed to block SIGWINCH"
 msgstr "tõrge signaali SIGWINCH blokkimisel"
 
-#: dselect/baselist.cc:99
+#: dselect/baselist.cc
 msgid "failed to set new SIGWINCH sigact"
 msgstr "tõrge signaalile SIGWINCH uue sigact'i määramisel"
 
-#: dselect/baselist.cc:174
+#: dselect/baselist.cc
 msgid "failed to allocate colour pair"
 msgstr "tõrge värvustepaari eraldamisel"
 
-#: dselect/baselist.cc:203
+#: dselect/baselist.cc
 msgid "failed to create title window"
 msgstr "tõrge pealkirjaakna loomisel"
 
-#: dselect/baselist.cc:207
+#: dselect/baselist.cc
 msgid "failed to create whatinfo window"
 msgstr "tõrge teabeakna loomisel"
 
-#: dselect/baselist.cc:211
+#: dselect/baselist.cc
 msgid "failed to create baselist pad"
 msgstr ""
 
-#: dselect/baselist.cc:214
+#: dselect/baselist.cc
 msgid "failed to create heading pad"
 msgstr ""
 
-#: dselect/baselist.cc:218
+#: dselect/baselist.cc
 msgid "failed to create thisstate pad"
 msgstr ""
 
-#: dselect/baselist.cc:222
+#: dselect/baselist.cc
 msgid "failed to create info pad"
 msgstr ""
 
-#: dselect/baselist.cc:227
+#: dselect/baselist.cc
 msgid "failed to create query window"
 msgstr "tõrge päringuakna loomisel"
 
-#: dselect/baselist.cc:298
+#: dselect/baselist.cc
 msgid "Keybindings"
 msgstr "Klahviseosed"
 
-#: dselect/baselist.cc:347
+#: dselect/baselist.cc
 #, c-format
 msgid "  -- %d%%, press "
 msgstr "  -- %d%%, vajuta "
 
-#: dselect/baselist.cc:350
+#: dselect/baselist.cc
 #, c-format
 msgid "%s for more"
 msgstr "%s edasikerimiseks"
 
-#: dselect/baselist.cc:354
+#: dselect/baselist.cc
 #, c-format
 msgid "%s to go back"
 msgstr "%s tagasikerimiseks"
 
-#: dselect/bindings.cc:78
+#: dselect/bindings.cc
 msgid "[not bound]"
 msgstr ""
 
-#: dselect/bindings.cc:82
+#: dselect/bindings.cc
 #, c-format
 msgid "[unk: %d]"
 msgstr "[tundm: %d]"
 
-#: dselect/bindings.cc:141
+#: dselect/bindings.cc
 msgid "Scroll onwards through help/information"
 msgstr "Abi või teabe edasikerimine"
 
-#: dselect/bindings.cc:142
+#: dselect/bindings.cc
 msgid "Scroll backwards through help/information"
 msgstr "Abi või teabe tagasikerimine"
 
-#: dselect/bindings.cc:143
+#: dselect/bindings.cc
 msgid "Move up"
 msgstr "Liikumine üles"
 
-#: dselect/bindings.cc:144
+#: dselect/bindings.cc
 msgid "Move down"
 msgstr "Liikumine alla"
 
-#: dselect/bindings.cc:145
+#: dselect/bindings.cc
 msgid "Go to top of list"
 msgstr "Nimekirja algusesse"
 
-#: dselect/bindings.cc:146
+#: dselect/bindings.cc
 msgid "Go to end of list"
 msgstr "Nimekirja lõppu"
 
-#: dselect/bindings.cc:147
+#: dselect/bindings.cc
 msgid "Request help (cycle through help screens)"
 msgstr "Abiteabe küsimine (kuvade kaupa)"
 
-#: dselect/bindings.cc:148
+#: dselect/bindings.cc
 msgid "Cycle through information displays"
 msgstr "Järgmise teabekuva aktiveerimine"
 
-#: dselect/bindings.cc:149
+#: dselect/bindings.cc
 msgid "Redraw display"
 msgstr "Kuva ülejoonistamine"
 
-#: dselect/bindings.cc:150
+#: dselect/bindings.cc
 msgid "Scroll onwards through list by 1 line"
 msgstr "Nimekirja edasikerimine ühe rea võrra"
 
-#: dselect/bindings.cc:151
+#: dselect/bindings.cc
 msgid "Scroll backwards through list by 1 line"
 msgstr "Nimekirja tagasikerimine ühe rea võrra"
 
-#: dselect/bindings.cc:152
+#: dselect/bindings.cc
 msgid "Scroll onwards through help/information by 1 line"
 msgstr "Abi või teabe edasikerimine ühe rea võrra"
 
-#: dselect/bindings.cc:153
+#: dselect/bindings.cc
 msgid "Scroll backwards through help/information by 1 line"
 msgstr "Abi või teabe tagasikerimine ühe rea võrra"
 
-#: dselect/bindings.cc:154
+#: dselect/bindings.cc
 msgid "Scroll onwards through list"
 msgstr "Nimekirja edasikerimine"
 
-#: dselect/bindings.cc:155
+#: dselect/bindings.cc
 msgid "Scroll backwards through list"
 msgstr "Nimekirja tagasikerimine"
 
-#: dselect/bindings.cc:158
+#: dselect/bindings.cc
 msgid "Mark package(s) for installation"
 msgstr "Paki (pakkide) märkimine paigaldamiseks"
 
-#: dselect/bindings.cc:159
+#: dselect/bindings.cc
 msgid "Mark package(s) for deinstallation"
 msgstr "Paki (pakkide) märkimine eemaldamiseks"
 
-#: dselect/bindings.cc:160
+#: dselect/bindings.cc
 msgid "Mark package(s) for deinstall and purge"
 msgstr "Paki (pakkide) märkimine eemaldamiseks ja puhastamiseks"
 
-#: dselect/bindings.cc:161
+#: dselect/bindings.cc
 msgid "Make highlight more specific"
 msgstr ""
 
-#: dselect/bindings.cc:162
+#: dselect/bindings.cc
 msgid "Make highlight less specific"
 msgstr ""
 
-#: dselect/bindings.cc:163
+#: dselect/bindings.cc
 msgid "Search for a package whose name contains a string"
 msgstr "Pakkide otsimine paki nimes sisalduva stringi järgi"
 
-#: dselect/bindings.cc:164
+#: dselect/bindings.cc
 #, fuzzy
 #| msgid "Repeat last search."
 msgid "Repeat last search"
 msgstr "Viimase otsingu kordamine."
 
-#: dselect/bindings.cc:165
+#: dselect/bindings.cc
 msgid "Swap sort order priority/section"
 msgstr "Sortimisjärjestuse vahetamine: tähtsus/jaotis"
 
-#: dselect/bindings.cc:166
+#: dselect/bindings.cc
 msgid "Quit, confirming, and checking dependencies"
 msgstr "Lõpetamine, kinnituse küsimine ja sõltuvuste kontrollimine"
 
-#: dselect/bindings.cc:167
+#: dselect/bindings.cc
 msgid "Quit, confirming without check"
 msgstr "Lõpetamine ilma sõltuvuste kontrollita"
 
-#: dselect/bindings.cc:168
+#: dselect/bindings.cc
 msgid "Quit, rejecting conflict/dependency suggestions"
 msgstr ""
 "Lõpetamine koos kõigi vastuolu- ja sõltuvussoovituste tagasilükkamisega"
 
-#: dselect/bindings.cc:169
+#: dselect/bindings.cc
 msgid "Abort - quit without making changes"
 msgstr "Katkestamine - lõpetatakse ilma muudatusi tegemata"
 
-#: dselect/bindings.cc:170
+#: dselect/bindings.cc
 msgid "Revert to old state for all packages"
 msgstr "Kõigi pakkide vana oleku taastamine"
 
-#: dselect/bindings.cc:171
+#: dselect/bindings.cc
 msgid "Revert to suggested state for all packages"
 msgstr ""
 
-#: dselect/bindings.cc:172
+#: dselect/bindings.cc
 msgid "Revert to directly requested state for all packages"
 msgstr ""
 
-#: dselect/bindings.cc:173
+#: dselect/bindings.cc
 #, fuzzy
 msgid "Revert to currently installed state for all packages"
 msgstr "Kõigi pakkide vana oleku taastamine"
 
-#: dselect/bindings.cc:176
+#: dselect/bindings.cc
 msgid "Select currently-highlighted access method"
 msgstr "Hetkel esiletõstetud ligipääsumeetodi valimine"
 
-#: dselect/bindings.cc:177
+#: dselect/bindings.cc
 msgid "Quit without changing selected access method"
 msgstr "Lõpetamine ilma ligipääsumeetodit valimata"
 
-#: dselect/helpmsgs.cc:29
+#: dselect/helpmsgs.cc
 msgid "Keystrokes"
 msgstr "Klahvivajutused"
 
-#: dselect/helpmsgs.cc:29
+#: dselect/helpmsgs.cc
 #, fuzzy
 #| msgid ""
 #| "Motion keys: Next/Previous, Top/End, Up/Down, Backwards/Forwards:\n"
@@ -368,11 +368,11 @@ msgstr ""
 "  /                otsing (katkestamiseks Enter, kui otsingustring on tühi)\n"
 "  \\                viimase otsingu kordamine\n"
 
-#: dselect/helpmsgs.cc:55
+#: dselect/helpmsgs.cc
 msgid "Introduction to package selections"
 msgstr "Pakkide valimise sissejuhtatus"
 
-#: dselect/helpmsgs.cc:55
+#: dselect/helpmsgs.cc
 msgid ""
 "Welcome to dselect's main package listing.\n"
 "\n"
@@ -403,11 +403,11 @@ msgid ""
 "Press <space> to leave help and enter the list now.\n"
 msgstr ""
 
-#: dselect/helpmsgs.cc:80
+#: dselect/helpmsgs.cc
 msgid "Introduction to read-only package list browser"
 msgstr "Sissejuhatus ainult vaatamiseks mõeldud pakinimekirja sirvijasse"
 
-#: dselect/helpmsgs.cc:80
+#: dselect/helpmsgs.cc
 msgid ""
 "Welcome to dselect's main package listing.\n"
 "\n"
@@ -428,11 +428,11 @@ msgid ""
 "Press <space> to leave help and enter the list now.\n"
 msgstr ""
 
-#: dselect/helpmsgs.cc:99
+#: dselect/helpmsgs.cc
 msgid "Introduction to conflict/dependency resolution sub-list"
 msgstr "Sissejuhatus sõltuvuste ja vastuolude lahendamise alamnimekirja"
 
-#: dselect/helpmsgs.cc:99
+#: dselect/helpmsgs.cc
 msgid ""
 "Dependency/conflict resolution - introduction.\n"
 "\n"
@@ -467,11 +467,11 @@ msgid ""
 "help.\n"
 msgstr ""
 
-#: dselect/helpmsgs.cc:125
+#: dselect/helpmsgs.cc
 msgid "Display, part 1: package listing and status chars"
 msgstr "Kuva, I osa: pakkide nimekiri ja olekumärgid"
 
-#: dselect/helpmsgs.cc:125
+#: dselect/helpmsgs.cc
 msgid ""
 "The top half of the screen shows a list of packages.  For each package you "
 "see\n"
@@ -504,11 +504,11 @@ msgid ""
 "description.\n"
 msgstr ""
 
-#: dselect/helpmsgs.cc:152
+#: dselect/helpmsgs.cc
 msgid "Display, part 2: list highlight; information display"
 msgstr "Kuva, II osa: nimekirja esiletõstmine ja andmete kuvamine"
 
-#: dselect/helpmsgs.cc:152
+#: dselect/helpmsgs.cc
 msgid ""
 "* Highlight: One line in the package list will be highlighted.  It "
 "indicates\n"
@@ -535,11 +535,11 @@ msgid ""
 "  information display or expand it to use almost all of the screen.\n"
 msgstr ""
 
-#: dselect/helpmsgs.cc:176
+#: dselect/helpmsgs.cc
 msgid "Introduction to method selection display"
 msgstr "Sissejuhatus meetodite valiku kuvasse"
 
-#: dselect/helpmsgs.cc:176
+#: dselect/helpmsgs.cc
 msgid ""
 "dselect and dpkg can do automatic installation, loading the package files to "
 "be\n"
@@ -581,11 +581,11 @@ msgstr ""
 "abiteabe\n"
 "menüüs vajuta `?'.\n"
 
-#: dselect/helpmsgs.cc:196
+#: dselect/helpmsgs.cc
 msgid "Keystrokes for method selection"
 msgstr "Meetodite valiku klahvivajutused"
 
-#: dselect/helpmsgs.cc:196
+#: dselect/helpmsgs.cc
 msgid ""
 "Motion keys: Next/Previous, Top/End, Up/Down, Backwards/Forwards:\n"
 "  j, Down-arrow         k, Up-arrow             move highlight\n"
@@ -635,104 +635,104 @@ msgstr ""
 "  /                otsing (katkestamiseks Enter, kui otsingustring on tühi)\n"
 "  \\                viimase otsingu kordamine\n"
 
-#: dselect/main.cc:63
+#: dselect/main.cc
 msgid "Type dselect --help for help."
 msgstr "Abiteabe jaoks käivita `dselect --help'."
 
-#: dselect/main.cc:145
+#: dselect/main.cc
 msgid "a"
 msgstr "p"
 
-#: dselect/main.cc:145
+#: dselect/main.cc
 msgid "[A]ccess"
 msgstr "[P]ääs"
 
-#: dselect/main.cc:145
+#: dselect/main.cc
 msgid "Choose the access method to use."
 msgstr "Kasutatavate ligipääsumeetodite valimine."
 
-#: dselect/main.cc:146
+#: dselect/main.cc
 msgid "u"
 msgstr "u"
 
-#: dselect/main.cc:146
+#: dselect/main.cc
 msgid "[U]pdate"
 msgstr "[U]uenda"
 
-#: dselect/main.cc:146
+#: dselect/main.cc
 msgid "Update list of available packages, if possible."
 msgstr "Saadaolevate pakkide nimekirja uuendamine (kui võimalik)."
 
-#: dselect/main.cc:147
+#: dselect/main.cc
 msgid "s"
 msgstr "v"
 
-#: dselect/main.cc:147
+#: dselect/main.cc
 msgid "[S]elect"
 msgstr "[V]ali"
 
-#: dselect/main.cc:147
+#: dselect/main.cc
 msgid "Request which packages you want on your system."
 msgstr "Pakkide oleku seadmine (paigaldamine, eemaldamine jne)."
 
-#: dselect/main.cc:148
+#: dselect/main.cc
 msgid "i"
 msgstr "p"
 
-#: dselect/main.cc:148
+#: dselect/main.cc
 msgid "[I]nstall"
 msgstr "[P]aigalda"
 
-#: dselect/main.cc:148
+#: dselect/main.cc
 msgid "Install and upgrade wanted packages."
 msgstr "Pakkide paigaldamine ja uuendamine."
 
-#: dselect/main.cc:149
+#: dselect/main.cc
 msgid "c"
 msgstr "s"
 
-#: dselect/main.cc:149
+#: dselect/main.cc
 msgid "[C]onfig"
 msgstr "[S]eadista"
 
-#: dselect/main.cc:149
+#: dselect/main.cc
 msgid "Configure any packages that are unconfigured."
 msgstr "Kõigi seadistamata pakkide seadistamine."
 
-#: dselect/main.cc:150
+#: dselect/main.cc
 msgid "r"
 msgstr "e"
 
-#: dselect/main.cc:150
+#: dselect/main.cc
 msgid "[R]emove"
 msgstr "[E]emalda"
 
-#: dselect/main.cc:150
+#: dselect/main.cc
 msgid "Remove unwanted software."
 msgstr "Tarbetu tarkvara eemaldamine."
 
-#: dselect/main.cc:151
+#: dselect/main.cc
 msgid "q"
 msgstr "l"
 
-#: dselect/main.cc:151
+#: dselect/main.cc
 msgid "[Q]uit"
 msgstr "[L]õpeta"
 
-#: dselect/main.cc:151
+#: dselect/main.cc
 msgid "Quit dselect."
 msgstr "Dselect'i sulgemine"
 
-#: dselect/main.cc:152
+#: dselect/main.cc
 msgid "menu"
 msgstr ""
 
-#: dselect/main.cc:157
+#: dselect/main.cc
 #, c-format
 msgid "Debian `%s' package handling frontend version %s.\n"
 msgstr "Debiani `%s' pakihaldusprogrammi kasutajaliidese versioon %s.\n"
 
-#: dselect/main.cc:160
+#: dselect/main.cc
 #, fuzzy
 msgid ""
 "This is free software; see the GNU General Public License version 2 or\n"
@@ -742,20 +742,28 @@ msgstr ""
 "Litsentsi 2. versioonis. Programmil puudub igasugune garantii.\n"
 "Autoriõiguste ja litsentsi üksikasjade nägemiseks käivita `%s --license'.\n"
 
-#: dselect/main.cc:169 dselect/main.cc:217
+#: dselect/main.cc
 msgid "<standard output>"
 msgstr ""
 
-#: dselect/main.cc:180
-#, c-format
+#: dselect/main.cc
+#, fuzzy, c-format
+#| msgid ""
+#| "Usage: %s [<option> ...] [<action> ...]\n"
+#| "\n"
 msgid ""
-"Usage: %s [<option> ...] [<action> ...]\n"
+"Usage: %s [<option>...] [<command>...]\n"
 "\n"
 msgstr ""
 "Kasutamine: %s [<võti> ...] [<tegevus> ...]\n"
 "\n"
 
-#: dselect/main.cc:184
+#: dselect/main.cc
+#, c-format
+msgid "Commands:\n"
+msgstr ""
+
+#: dselect/main.cc
 #, fuzzy, c-format
 #| msgid ""
 #| "Options:\n"
@@ -769,12 +777,12 @@ msgstr ""
 #| "\n"
 msgid ""
 "Options:\n"
-"  --admindir <directory>     Use <directory> instead of %s.\n"
-"  --expert                   Turn on expert mode.\n"
-"  --debug <file> | -D<file>  Turn on debugging, sending output to <file>.\n"
-"  --colour | --color screenpart:[foreground],[background][:attr[+attr+...]]\n"
-"                             Configure screen colours.\n"
-"\n"
+"      --admindir <directory>       Use <directory> instead of %s.\n"
+"      --expert                     Turn on expert mode.\n"
+"  -D, --debug <file>               Turn on debugging, send output to "
+"<file>.\n"
+"      --color <color-spec>         Configure screen colors.\n"
+"      --colour <color-spec>        Ditto.\n"
 msgstr ""
 "Võtmed:\n"
 "  --admindir <kataloog>      %s asemel <kataloogi> kasutamine.\n"
@@ -785,11 +793,11 @@ msgstr ""
 "                             Ekraanivärvuste seadistamine.\n"
 "\n"
 
-#: dselect/main.cc:193
+#: dselect/main.cc
 #, fuzzy, c-format
 msgid ""
-"  --help                     Show this help message.\n"
-"  --version                  Show the version.\n"
+"  -?, --help                       Show this help message.\n"
+"      --version                    Show the version.\n"
 "\n"
 msgstr ""
 "  --help                     Selle abiteabe näitamine.\n"
@@ -797,65 +805,67 @@ msgstr ""
 "  --license | --licence      Litsentsi näitamine.\n"
 "\n"
 
-#: dselect/main.cc:197
-#, fuzzy, c-format
-#| msgid "Section"
-msgid "Actions:\n"
-msgstr "Jaotis"
-
-#: dselect/main.cc:202
+#: dselect/main.cc
 #, c-format
-msgid "Screenparts:\n"
+msgid ""
+"<color-spec> is <screen-part>:[<foreground>],[<background>][:"
+"<attr>[+<attr>]...]\n"
+msgstr ""
+
+#: dselect/main.cc
+#, fuzzy, c-format
+#| msgid "Screenparts:\n"
+msgid "<screen-part> is:"
 msgstr "Ekraani osad:\n"
 
-#: dselect/main.cc:207
+#: dselect/main.cc
 #, c-format
-msgid "Colours:\n"
-msgstr "Värvused:\n"
+msgid "<color> is:"
+msgstr ""
 
-#: dselect/main.cc:212
+#: dselect/main.cc
 #, c-format
-msgid "Attributes:\n"
-msgstr "Rekvisiidid:\n"
+msgid "<attr> is:"
+msgstr ""
 
-#: dselect/main.cc:232
+#: dselect/main.cc
 #, c-format
 msgid "couldn't open debug file `%.255s'\n"
 msgstr "silumisfaili `%.255s' pole võimalik avada\n"
 
-#: dselect/main.cc:253
+#: dselect/main.cc
 #, fuzzy, c-format
 #| msgid "Invalid %s `%s'\n"
 msgid "invalid %s '%s'"
 msgstr "Lubamatu %s `%s'\n"
 
-#: dselect/main.cc:272
+#: dselect/main.cc
 msgid "screen part"
 msgstr "ekraani osa"
 
-#: dselect/main.cc:278
+#: dselect/main.cc
 #, fuzzy
 #| msgid "Null colour specification\n"
 msgid "null colour specification"
 msgstr "Tühi värvusekirjeldus\n"
 
-#: dselect/main.cc:286 dselect/main.cc:291
+#: dselect/main.cc
 msgid "colour"
 msgstr "värvus"
 
-#: dselect/main.cc:299
+#: dselect/main.cc
 msgid "colour attribute"
 msgstr "värvuse rekvisiit"
 
-#: dselect/main.cc:333
+#: dselect/main.cc
 msgid "Terminal does not appear to support cursor addressing.\n"
 msgstr "Terminal ei paista kursori adresseerimist toetavat.\n"
 
-#: dselect/main.cc:335
+#: dselect/main.cc
 msgid "Terminal does not appear to support highlighting.\n"
 msgstr "Terminal ei paista esiletõstmist toetavat.\n"
 
-#: dselect/main.cc:337
+#: dselect/main.cc
 #, c-format
 msgid ""
 "Set your TERM variable correctly, use a better terminal,\n"
@@ -864,11 +874,11 @@ msgstr ""
 "Määra oma TERM muutuja korrektselt, kasuta paremat terminali\n"
 "või kasuta pakipõhist haldusvahendit %s.\n"
 
-#: dselect/main.cc:340
+#: dselect/main.cc
 msgid "terminal lacks necessary features, giving up"
 msgstr "terminalil puuduvad vajalikud võimalused, annan alla"
 
-#: dselect/main.cc:425
+#: dselect/main.cc
 msgid ""
 "\n"
 "\n"
@@ -883,7 +893,7 @@ msgstr ""
 "^L joonistab ekraanipildi uuesti.\n"
 "\n"
 
-#: dselect/main.cc:430
+#: dselect/main.cc
 msgid ""
 "Copyright (C) 1994-1996 Ian Jackson.\n"
 "Copyright (C) 2000,2001 Wichert Akkerman.\n"
@@ -891,7 +901,7 @@ msgstr ""
 "Autoriõigus (C) 1994-1996 Ian Jackson.\n"
 "Autoriõigus (C) 2000,2001 Wichert Akkerman.\n"
 
-#: dselect/main.cc:436
+#: dselect/main.cc
 msgid ""
 "\n"
 "\n"
@@ -901,57 +911,57 @@ msgstr ""
 "\n"
 "Ligipääs ainult vaatamiseks: võimalik on kasutada ainult valikute eelvaadet!"
 
-#: dselect/main.cc:455
+#: dselect/main.cc
 msgid "failed to getch in main menu"
 msgstr "tõrge peamenüüs, funktsioonis getch"
 
-#: dselect/main.cc:538
+#: dselect/main.cc
 #, c-format
 msgid "unknown action string `%.50s'"
 msgstr "tundmatu tegevuse string `%.50s'"
 
-#: dselect/methlist.cc:66
+#: dselect/methlist.cc
 msgid "Abbrev."
 msgstr "Lühend"
 
-#: dselect/methlist.cc:67 dselect/pkgdisplay.cc:188 dselect/pkginfo.cc:110
+#: dselect/methlist.cc dselect/pkgdisplay.cc dselect/pkginfo.cc
 msgid "Description"
 msgstr "Kirjeldus"
 
-#: dselect/methlist.cc:73
+#: dselect/methlist.cc
 msgid "dselect - list of access methods"
 msgstr "dselect - ligipääsumeetodite nimekiri"
 
-#: dselect/methlist.cc:82
+#: dselect/methlist.cc
 #, c-format
 msgid "Access method `%s'."
 msgstr "Ligipääsumeetod `%s'."
 
-#: dselect/methlist.cc:161 dselect/pkglist.cc:587
+#: dselect/methlist.cc dselect/pkglist.cc
 msgid "doupdate failed"
 msgstr "tõrge funktsioonis doupdate"
 
-#: dselect/methlist.cc:164 dselect/pkglist.cc:590
+#: dselect/methlist.cc dselect/pkglist.cc
 msgid "failed to unblock SIGWINCH"
 msgstr "tõrge SIGWINCH signaalilt blokeeringu eemaldamisel"
 
-#: dselect/methlist.cc:169 dselect/pkglist.cc:595
+#: dselect/methlist.cc dselect/pkglist.cc
 msgid "failed to re-block SIGWINCH"
 msgstr "tõrge SIGWINCH signaali uuesti blokkimisel"
 
-#: dselect/methlist.cc:170 dselect/pkglist.cc:597
+#: dselect/methlist.cc dselect/pkglist.cc
 msgid "getch failed"
 msgstr "tõrge funktsioonis getch"
 
-#: dselect/methlist.cc:187
+#: dselect/methlist.cc
 msgid "Explanation"
 msgstr "Selgitus"
 
-#: dselect/methlist.cc:197
+#: dselect/methlist.cc
 msgid "No explanation available."
 msgstr "Selgitust pole saadaval."
 
-#: dselect/method.cc:67
+#: dselect/method.cc
 #, c-format
 msgid ""
 "\n"
@@ -962,7 +972,7 @@ msgstr ""
 "\n"
 "%s: %s\n"
 
-#: dselect/method.cc:70
+#: dselect/method.cc
 msgid ""
 "\n"
 "Press <enter> to continue."
@@ -970,192 +980,202 @@ msgstr ""
 "\n"
 "Jätkamiseks vajuta <enter>."
 
-#: dselect/method.cc:82
+#: dselect/method.cc
 msgid "cannot unlock access method area"
 msgstr ""
 
-#: dselect/method.cc:96
+#: dselect/method.cc
 #, fuzzy
 #| msgid " does not appear to be available\n"
 msgid "no access methods are available"
 msgstr " ei paista olevat saadaval\n"
 
-#: dselect/method.cc:115
+#: dselect/method.cc
 msgid "requested operation requires superuser privilege"
 msgstr ""
 
-#: dselect/method.cc:118
+#: dselect/method.cc
 #, fuzzy
 #| msgid "Choose the access method to use."
 msgid "cannot open or create access method lockfile"
 msgstr "Kasutatavate ligipääsumeetodite valimine."
 
-#: dselect/method.cc:125
+#: dselect/method.cc
 msgid "the access method area is already locked"
 msgstr ""
 
-#: dselect/method.cc:128
+#: dselect/method.cc
 #, fuzzy
 #| msgid "dselect - list of access methods"
 msgid "cannot lock access method area"
 msgstr "dselect - ligipääsumeetodite nimekiri"
 
-#: dselect/method.cc:161
+#: dselect/method.cc
 #, c-format
 msgid "Press <enter> to continue.\n"
 msgstr "Jätkamiseks vajuta <enter>.\n"
 
-#: dselect/method.cc:162
+#: dselect/method.cc
 #, fuzzy
 msgid "<standard error>"
 msgstr "viga standardsesse veaväljundisse kirjutamisel"
 
-#: dselect/method.cc:165
+#: dselect/method.cc
 msgid "error reading acknowledgement of program failure message"
 msgstr ""
 
-#: dselect/method.cc:187
+#: dselect/method.cc
 msgid "no access method is selected or configured"
 msgstr ""
 
-#: dselect/method.cc:196
+#: dselect/method.cc
 msgid "update available list script"
 msgstr ""
 
-#: dselect/method.cc:200
+#: dselect/method.cc
 msgid "installation script"
 msgstr "paigaldusskript"
 
-#: dselect/method.cc:246
+#: dselect/method.cc
 msgid "query/setup script"
 msgstr ""
 
-#: dselect/methparse.cc:53
+#: dselect/methparse.cc
 #, c-format
 msgid "syntax error in method options file `%.250s' -- %s"
 msgstr "süntaksi viga meetodite valikute failis `%.250s' -- %s"
 
-#: dselect/methparse.cc:59
+#: dselect/methparse.cc
 #, c-format
 msgid "error reading options file `%.250s'"
 msgstr "viga valikute faili `%.250s' lugemisel"
 
-#: dselect/methparse.cc:93
+#: dselect/methparse.cc
 #, c-format
 msgid "unable to read `%.250s' directory for reading methods"
 msgstr "kataloogist `%.250s' pole võimalik meetodeid lugeda"
 
-#: dselect/methparse.cc:109
+#: dselect/methparse.cc
 #, c-format
 msgid "method `%.250s' has name that is too long (%d > %d characters)"
 msgstr "meetodi `%.250s' nimi on liiga pikk (%d > %d märki)"
 
-#: dselect/methparse.cc:120
+#: dselect/methparse.cc
 #, c-format
 msgid "unable to access method script `%.250s'"
 msgstr "meetodi skriptile `%.250s' pole võimalik ligi pääseda"
 
-#: dselect/methparse.cc:126
+#: dselect/methparse.cc
 #, c-format
 msgid "unable to read method options file `%.250s'"
 msgstr "meetodi skripti `%.250s' pole võimalik lugeda"
 
-#: dselect/methparse.cc:150
+#: dselect/methparse.cc
 msgid "non-digit where digit wanted"
 msgstr ""
 
-#: dselect/methparse.cc:153
-msgid "EOF in index string"
+#: dselect/methparse.cc
+#, fuzzy
+#| msgid "EOF in index string"
+msgid "end of file in index string"
 msgstr "faililõputunnus indeksistringis"
 
-#: dselect/methparse.cc:156
+#: dselect/methparse.cc
 msgid "index string too long"
 msgstr "indeksistring on liiga pikk"
 
-#: dselect/methparse.cc:159
+#: dselect/methparse.cc
 msgid "newline before option name start"
 msgstr ""
 
-#: dselect/methparse.cc:161
-msgid "EOF before option name start"
+#: dselect/methparse.cc
+#, fuzzy
+#| msgid "EOF before option name start"
+msgid "end of file before option name start"
 msgstr "faililõputunnus enne valiku nime algust"
 
-#: dselect/methparse.cc:165
+#: dselect/methparse.cc
 msgid "nonalpha where option name start wanted"
 msgstr ""
 
-#: dselect/methparse.cc:167
+#: dselect/methparse.cc
 msgid "non-alphanum in option name"
 msgstr ""
 
-#: dselect/methparse.cc:170
-msgid "EOF in option name"
+#: dselect/methparse.cc
+#, fuzzy
+#| msgid "EOF in option name"
+msgid "end of file in option name"
 msgstr "faililõputunnus valiku nimes"
 
-#: dselect/methparse.cc:175
+#: dselect/methparse.cc
 msgid "newline before summary"
 msgstr "reavahetus enne kokkuvõtet"
 
-#: dselect/methparse.cc:177
-msgid "EOF before summary"
-msgstr "faililõputunnus enne kokkuvõtet"
+#: dselect/methparse.cc
+#, fuzzy
+#| msgid "newline before summary"
+msgid "end of file before summary"
+msgstr "reavahetus enne kokkuvõtet"
 
-#: dselect/methparse.cc:183
-msgid "EOF in summary - missing newline"
+#: dselect/methparse.cc
+#, fuzzy
+#| msgid "EOF in summary - missing newline"
+msgid "end of file in summary - missing newline"
 msgstr "faililõputunnus kokkuvõttes - puudub reavahetus"
 
-#: dselect/methparse.cc:193
+#: dselect/methparse.cc
 #, c-format
 msgid "unable to open option description file `%.250s'"
 msgstr ""
 
-#: dselect/methparse.cc:197
+#: dselect/methparse.cc
 #, c-format
 msgid "unable to stat option description file `%.250s'"
 msgstr ""
 
-#: dselect/methparse.cc:201
+#: dselect/methparse.cc
 #, c-format
 msgid "failed to read option description file `%.250s'"
 msgstr ""
 
-#: dselect/methparse.cc:204
+#: dselect/methparse.cc
 #, c-format
 msgid "error during read of option description file `%.250s'"
 msgstr ""
 
-#: dselect/methparse.cc:227
+#: dselect/methparse.cc
 #, c-format
 msgid "error during read of method options file `%.250s'"
 msgstr ""
 
-#: dselect/methparse.cc:250
+#: dselect/methparse.cc
 #, c-format
 msgid "unable to open current option file `%.250s'"
 msgstr ""
 
-#: dselect/methparse.cc:286
+#: dselect/methparse.cc
 #, c-format
 msgid "unable to write new option to `%.250s'"
 msgstr ""
 
-#: dselect/pkgdisplay.cc:36
+#: dselect/pkgdisplay.cc
 msgid "new package"
 msgstr "uus pakk"
 
-#: dselect/pkgdisplay.cc:37
+#: dselect/pkgdisplay.cc
 msgid "install"
 msgstr "paigalda"
 
-#: dselect/pkgdisplay.cc:38
+#: dselect/pkgdisplay.cc
 msgid "hold"
 msgstr "hoia"
 
-#: dselect/pkgdisplay.cc:39
+#: dselect/pkgdisplay.cc
 msgid "remove"
 msgstr "eemalda"
 
-#: dselect/pkgdisplay.cc:40
+#: dselect/pkgdisplay.cc
 msgid "purge"
 msgstr "puhasta"
 
@@ -1163,331 +1183,325 @@ msgstr "puhasta"
 #. * the empty string to store information about the translation. DO NOT
 #. * CHANGE THAT IN A TRANSLATION! The code really relies on that being
 #. * a single space.
-#: dselect/pkgdisplay.cc:47
+#: dselect/pkgdisplay.cc
 msgid " "
 msgstr " "
 
-#: dselect/pkgdisplay.cc:48
+#: dselect/pkgdisplay.cc
 msgid "REINSTALL"
 msgstr ""
 
-#: dselect/pkgdisplay.cc:51
+#: dselect/pkgdisplay.cc
 msgid "not installed"
 msgstr "paigaldamata"
 
-#: dselect/pkgdisplay.cc:52
+#: dselect/pkgdisplay.cc
 msgid "removed (configs remain)"
 msgstr "eemaldatud (seadistused on alles)"
 
-#: dselect/pkgdisplay.cc:53
+#: dselect/pkgdisplay.cc
 msgid "half installed"
 msgstr "osaliselt paigaldatud"
 
-#: dselect/pkgdisplay.cc:54
+#: dselect/pkgdisplay.cc
 msgid "unpacked (not set up)"
 msgstr "lahtipakitud (üles seadmata)"
 
-#: dselect/pkgdisplay.cc:55
+#: dselect/pkgdisplay.cc
 msgid "half configured (config failed)"
 msgstr ""
 
-#: dselect/pkgdisplay.cc:56
+#: dselect/pkgdisplay.cc
 msgid "awaiting trigger processing"
 msgstr ""
 
-#: dselect/pkgdisplay.cc:57
+#: dselect/pkgdisplay.cc
 msgid "triggered"
 msgstr ""
 
-#: dselect/pkgdisplay.cc:58
+#: dselect/pkgdisplay.cc
 msgid "installed"
 msgstr "paigaldatud"
 
-#: dselect/pkgdisplay.cc:61
+#: dselect/pkgdisplay.cc
 msgid "Required"
 msgstr "Nõutavad"
 
-#: dselect/pkgdisplay.cc:62
+#: dselect/pkgdisplay.cc
 msgid "Important"
 msgstr "Tähtsad"
 
-#: dselect/pkgdisplay.cc:63
+#: dselect/pkgdisplay.cc
 msgid "Standard"
 msgstr "Standardsed"
 
-#: dselect/pkgdisplay.cc:64
+#: dselect/pkgdisplay.cc
 msgid "Optional"
 msgstr "Valikulised"
 
-#: dselect/pkgdisplay.cc:65
+#: dselect/pkgdisplay.cc
 msgid "Extra"
 msgstr "Ekstra"
 
-#: dselect/pkgdisplay.cc:66
-msgid "!Bug!"
-msgstr "!Viga"
-
-#: dselect/pkgdisplay.cc:67
+#: dselect/pkgdisplay.cc
 msgid "Unclassified"
 msgstr "Liigitamata"
 
-#: dselect/pkgdisplay.cc:70
+#: dselect/pkgdisplay.cc
 msgid "suggests"
 msgstr "vihjab pakile"
 
-#: dselect/pkgdisplay.cc:71
+#: dselect/pkgdisplay.cc
 msgid "recommends"
 msgstr "soovitab pakki"
 
-#: dselect/pkgdisplay.cc:72
+#: dselect/pkgdisplay.cc
 msgid "depends on"
 msgstr "sõltub pakist"
 
-#: dselect/pkgdisplay.cc:73
+#: dselect/pkgdisplay.cc
 msgid "pre-depends on"
 msgstr "eelsõltub pakist"
 
-#: dselect/pkgdisplay.cc:74
+#: dselect/pkgdisplay.cc
 msgid "breaks"
 msgstr ""
 
-#: dselect/pkgdisplay.cc:75
+#: dselect/pkgdisplay.cc
 msgid "conflicts with"
 msgstr "on vastuolus pakiga"
 
-#: dselect/pkgdisplay.cc:76
+#: dselect/pkgdisplay.cc
 msgid "provides"
 msgstr "tagab paki"
 
-#: dselect/pkgdisplay.cc:77
+#: dselect/pkgdisplay.cc
 msgid "replaces"
 msgstr "asendab paki"
 
-#: dselect/pkgdisplay.cc:78
+#: dselect/pkgdisplay.cc
 msgid "enhances"
 msgstr "laiendab pakki"
 
-#: dselect/pkgdisplay.cc:81
+#: dselect/pkgdisplay.cc
 msgid "Req"
 msgstr "Nõu"
 
-#: dselect/pkgdisplay.cc:82
+#: dselect/pkgdisplay.cc
 msgid "Imp"
 msgstr "Täh"
 
-#: dselect/pkgdisplay.cc:83
+#: dselect/pkgdisplay.cc
 msgid "Std"
 msgstr "Std"
 
-#: dselect/pkgdisplay.cc:84
+#: dselect/pkgdisplay.cc
 msgid "Opt"
 msgstr "Val"
 
-#: dselect/pkgdisplay.cc:85
+#: dselect/pkgdisplay.cc
 msgid "Xtr"
 msgstr "Eks"
 
-#: dselect/pkgdisplay.cc:86
+#: dselect/pkgdisplay.cc
 msgid "bUG"
 msgstr ""
 
-#: dselect/pkgdisplay.cc:87
+#: dselect/pkgdisplay.cc
 msgid "?"
 msgstr "?"
 
-#: dselect/pkgdisplay.cc:95 dselect/pkgdisplay.cc:115
+#: dselect/pkgdisplay.cc
 msgid "Broken"
 msgstr "Katkised"
 
-#: dselect/pkgdisplay.cc:96
+#: dselect/pkgdisplay.cc
 msgid "New"
 msgstr "Uued"
 
-#: dselect/pkgdisplay.cc:97
-msgid "Updated"
-msgstr "Uuendatud"
+#: dselect/pkgdisplay.cc
+msgid "Upgradable"
+msgstr ""
 
-#: dselect/pkgdisplay.cc:98
+#: dselect/pkgdisplay.cc
 msgid "Obsolete/local"
 msgstr "Aegunud/kohalikud"
 
-#: dselect/pkgdisplay.cc:99
-msgid "Up-to-date"
-msgstr "Ajakohased"
+#: dselect/pkgdisplay.cc
+msgid "Installed"
+msgstr "Paigaldatud"
 
-#: dselect/pkgdisplay.cc:100
+#: dselect/pkgdisplay.cc
 msgid "Available"
 msgstr "Saadaolevad"
 
-#: dselect/pkgdisplay.cc:101 dselect/pkgdisplay.cc:117
+#: dselect/pkgdisplay.cc
 msgid "Removed"
 msgstr "Eemaldatud"
 
-#: dselect/pkgdisplay.cc:102 dselect/pkgdisplay.cc:111
+#: dselect/pkgdisplay.cc
 msgid "Brokenly installed packages"
 msgstr "Katkised paigaldatud pakid"
 
-#: dselect/pkgdisplay.cc:103
+#: dselect/pkgdisplay.cc
 msgid "Newly available packages"
 msgstr "Uued saadaolevad pakid"
 
-#: dselect/pkgdisplay.cc:104
-msgid "Updated packages (newer version is available)"
-msgstr "Uuendatud pakid (uuem versioon on saadaval)"
+#: dselect/pkgdisplay.cc
+#, fuzzy
+#| msgid "Newly available packages"
+msgid "Upgradable packages"
+msgstr "Uued saadaolevad pakid"
 
-#: dselect/pkgdisplay.cc:105
-msgid "Obsolete and local packages present on system"
+#: dselect/pkgdisplay.cc
+#, fuzzy
+#| msgid "Obsolete and local packages present on system"
+msgid "Obsolete and locally created packages"
 msgstr "Selles süsteemis olevad aegunud ja kohalikud pakid"
 
-#: dselect/pkgdisplay.cc:106
-msgid "Up to date installed packages"
-msgstr "Ajakohased paigaldatud pakid"
+#: dselect/pkgdisplay.cc
+msgid "Installed packages"
+msgstr "Paigaldatud pakid"
 
-#: dselect/pkgdisplay.cc:107
-msgid "Available packages (not currently installed)"
-msgstr "Saadaolevad pakid (hetkel paigaldamata)"
+#: dselect/pkgdisplay.cc
+#, fuzzy
+#| msgid "Up to date installed packages"
+msgid "Available not installed packages"
+msgstr "Ajakohased paigaldatud pakid"
 
-#: dselect/pkgdisplay.cc:108
+#: dselect/pkgdisplay.cc
 msgid "Removed and no longer available packages"
 msgstr "Eemaldatud pakid ja pakid, mida pole enam saadaval"
 
-#: dselect/pkgdisplay.cc:112
-msgid "Installed packages"
-msgstr "Paigaldatud pakid"
-
-#: dselect/pkgdisplay.cc:113
+#: dselect/pkgdisplay.cc
 msgid "Removed packages (configuration still present)"
 msgstr "Eemaldatud pakid (seadistusfailid on alles)"
 
-#: dselect/pkgdisplay.cc:114
+#: dselect/pkgdisplay.cc
 msgid "Purged packages and those never installed"
 msgstr "Puhastatud pakid ja need, mida pole kunagi paigaldatud"
 
-#: dselect/pkgdisplay.cc:116
-msgid "Installed"
-msgstr "Paigaldatud"
-
-#: dselect/pkgdisplay.cc:118
+#: dselect/pkgdisplay.cc
 msgid "Purged"
 msgstr "Puhastatud"
 
-#: dselect/pkgdisplay.cc:138
+#: dselect/pkgdisplay.cc
 msgid "Error"
 msgstr "Viga"
 
-#: dselect/pkgdisplay.cc:139
+#: dselect/pkgdisplay.cc
 msgid "Installed?"
 msgstr "Paigaldatud?"
 
-#: dselect/pkgdisplay.cc:140
+#: dselect/pkgdisplay.cc
 msgid "Old mark"
 msgstr "Vana mrk"
 
-#: dselect/pkgdisplay.cc:141
+#: dselect/pkgdisplay.cc
 msgid "Marked for"
 msgstr "Märgitud"
 
-#: dselect/pkgdisplay.cc:143
+#: dselect/pkgdisplay.cc
 msgid "EIOM"
 msgstr ""
 
-#: dselect/pkgdisplay.cc:147 dselect/pkgdisplay.cc:150
+#: dselect/pkgdisplay.cc
 msgid "Section"
 msgstr "Jaotis"
 
-#: dselect/pkgdisplay.cc:148
+#: dselect/pkgdisplay.cc
 msgid "Priority"
 msgstr "Tähtsus"
 
-#: dselect/pkgdisplay.cc:152
+#: dselect/pkgdisplay.cc
 msgid "Package"
 msgstr "Pakk"
 
-#: dselect/pkgdisplay.cc:161 dselect/pkgdisplay.cc:165
+#: dselect/pkgdisplay.cc
 #, fuzzy
 #| msgid "Avail.ver"
 msgid "Avail.arch"
 msgstr "Saadav.ver"
 
-#: dselect/pkgdisplay.cc:164
+#: dselect/pkgdisplay.cc
 #, fuzzy
 #| msgid "Inst.ver"
 msgid "Inst.arch"
 msgstr "Pgld.ver"
 
-#: dselect/pkgdisplay.cc:178 dselect/pkgdisplay.cc:182
+#: dselect/pkgdisplay.cc
 msgid "Avail.ver"
 msgstr "Saadav.ver"
 
-#: dselect/pkgdisplay.cc:181
+#: dselect/pkgdisplay.cc
 msgid "Inst.ver"
 msgstr "Pgld.ver"
 
-#: dselect/pkgdisplay.cc:197
+#: dselect/pkgdisplay.cc
 msgid "dselect - recursive package listing"
 msgstr "dselect - pakkide rekursiivne nimekiri"
 
-#: dselect/pkgdisplay.cc:199
+#: dselect/pkgdisplay.cc
 msgid "dselect - inspection of package states"
 msgstr "dselect - pakkide olekute inspekteerimine"
 
-#: dselect/pkgdisplay.cc:200
+#: dselect/pkgdisplay.cc
 msgid "dselect - main package listing"
 msgstr "dselect - pakkide peanimekiri"
 
-#: dselect/pkgdisplay.cc:208
+#: dselect/pkgdisplay.cc
 msgid " (by section)"
 msgstr " (jaotise järgi)"
 
-#: dselect/pkgdisplay.cc:211
+#: dselect/pkgdisplay.cc
 msgid " (avail., section)"
 msgstr " (saadavus, jaotis)"
 
-#: dselect/pkgdisplay.cc:214
+#: dselect/pkgdisplay.cc
 msgid " (status, section)"
 msgstr " (olek, jaotis)"
 
-#: dselect/pkgdisplay.cc:223
+#: dselect/pkgdisplay.cc
 msgid " (by priority)"
 msgstr " (tähtsuse järgi)"
 
-#: dselect/pkgdisplay.cc:226
+#: dselect/pkgdisplay.cc
 msgid " (avail., priority)"
 msgstr " (saadavus, tähtsus)"
 
-#: dselect/pkgdisplay.cc:229
+#: dselect/pkgdisplay.cc
 msgid " (status, priority)"
 msgstr " (olek, tähtsus)"
 
-#: dselect/pkgdisplay.cc:238
+#: dselect/pkgdisplay.cc
 msgid " (alphabetically)"
 msgstr " (tähestikuline)"
 
-#: dselect/pkgdisplay.cc:241
+#: dselect/pkgdisplay.cc
 msgid " (by availability)"
 msgstr " (saadavuse järgi)"
 
-#: dselect/pkgdisplay.cc:244
+#: dselect/pkgdisplay.cc
 msgid " (by status)"
 msgstr " (oleku järgi)"
 
-#: dselect/pkgdisplay.cc:259
+#: dselect/pkgdisplay.cc
 msgid " mark:+/=/- terse:v help:?"
 msgstr " märgi:+/=/- vähem:v abi:?"
 
-#: dselect/pkgdisplay.cc:260
+#: dselect/pkgdisplay.cc
 msgid " mark:+/=/- verbose:v help:?"
 msgstr " märgi:+/=/- rohkem:v abi:?"
 
-#: dselect/pkgdisplay.cc:262
+#: dselect/pkgdisplay.cc
 msgid " terse:v help:?"
 msgstr " vähem:v abi:?"
 
-#: dselect/pkgdisplay.cc:263
+#: dselect/pkgdisplay.cc
 msgid " verbose:v help:?"
 msgstr " rohkem:v abi:?"
 
-#: dselect/pkginfo.cc:85
+#: dselect/pkginfo.cc
 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 "
@@ -1499,82 +1513,111 @@ msgid ""
 "opportunity to mark packages in different kinds of groups."
 msgstr ""
 
-#: dselect/pkginfo.cc:98
+#: dselect/pkginfo.cc
 msgid "Interrelationships"
 msgstr "Sõltuvusseosed"
 
-#: dselect/pkginfo.cc:117
+#: dselect/pkginfo.cc
 msgid "No description available."
 msgstr "Kirjeldus pole saadaval."
 
-#: dselect/pkginfo.cc:135
+#: dselect/pkginfo.cc
 msgid "Installed control file information"
 msgstr "Paigaldatud juhtfaili andmed"
 
-#: dselect/pkginfo.cc:151
+#: dselect/pkginfo.cc
 msgid "Available control file information"
 msgstr "Saadaoleva juhtfaili andmed"
 
-#: dselect/pkglist.cc:425
+#: dselect/pkglist.cc
 #, fuzzy
 #| msgid "Installed packages"
 msgid "there are no packages"
 msgstr "Paigaldatud pakid"
 
-#: dselect/pkglist.cc:521
+#: dselect/pkglist.cc
 msgid "invalid search option given"
 msgstr "määrati lubamatu otsinguvalik"
 
-#: dselect/pkglist.cc:536
+#: dselect/pkglist.cc
 msgid "error in regular expression"
 msgstr "viga regulaaravaldises"
 
-#: dselect/pkgsublist.cc:111
+#: dselect/pkgsublist.cc
 msgid " does not appear to be available\n"
 msgstr " ei paista olevat saadaval\n"
 
-#: dselect/pkgsublist.cc:131
+#: dselect/pkgsublist.cc
 msgid " or "
 msgstr " või "
 
-#: dselect/pkgtop.cc:58
+#: dselect/pkgtop.cc
 msgid "All"
 msgstr "Kõik"
 
-#: dselect/pkgtop.cc:80
+#: dselect/pkgtop.cc
 msgid "All packages"
 msgstr "Kõik pakid"
 
-#: dselect/pkgtop.cc:84
+#: dselect/pkgtop.cc
 #, c-format
 msgid "%s packages without a section"
 msgstr "%s pakid ilma jaotiseta"
 
-#: dselect/pkgtop.cc:86
+#: dselect/pkgtop.cc
 #, c-format
 msgid "%s packages in section %s"
 msgstr "%s pakid jaotises %s"
 
-#: dselect/pkgtop.cc:92
+#: dselect/pkgtop.cc
 #, c-format
 msgid "%s %s packages"
 msgstr "%s %s pakid"
 
-#: dselect/pkgtop.cc:96
+#: dselect/pkgtop.cc
 #, c-format
 msgid "%s %s packages without a section"
 msgstr "%s %s pakid ilma jaotiseta"
 
-#: dselect/pkgtop.cc:98
+#: dselect/pkgtop.cc
 #, c-format
 msgid "%s %s packages in section %s"
 msgstr "%s %s pakid jaotises %s"
 
-#: dselect/pkgtop.cc:119
+#: dselect/pkgtop.cc
 #, c-format
 msgid "%-*s %s%s%s;  %s (was: %s).  %s"
 msgstr "%-*s %s%s%s;  %s (oli: %s).  %s"
 
+#, fuzzy
+#~| msgid "Section"
+#~ msgid "Actions:\n"
+#~ msgstr "Jaotis"
+
+#~ msgid "Colours:\n"
+#~ msgstr "Värvused:\n"
+
+#~ msgid "Attributes:\n"
+#~ msgstr "Rekvisiidid:\n"
+
+#~ msgid "EOF before summary"
+#~ msgstr "faililõputunnus enne kokkuvõtet"
+
+#~ msgid "!Bug!"
+#~ msgstr "!Viga"
+
+#~ msgid "Updated"
+#~ msgstr "Uuendatud"
+
+#~ msgid "Up-to-date"
+#~ msgstr "Ajakohased"
+
+#~ msgid "Updated packages (newer version is available)"
+#~ msgstr "Uuendatud pakid (uuem versioon on saadaval)"
+
+#~ msgid "Available packages (not currently installed)"
+#~ msgstr "Saadaolevad pakid (hetkel paigaldamata)"
+
 #~ msgid ""
 #~ "Actions:\n"
 #~ "  access update select install config remove quit\n"
diff --git a/dselect/po/eu.po b/dselect/po/eu.po
index 449d433d2..adfe70e85 100644
--- a/dselect/po/eu.po
+++ b/dselect/po/eu.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dselect 1.16.8\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2014-12-23 18:12+0100\n"
+"POT-Creation-Date: 2015-04-06 09:37+0200\n"
 "PO-Revision-Date: 2012-09-01 12:21+0200\n"
 "Last-Translator: Iñaki Larrañaga Murgoitio <dooteo@zundan.com>\n"
 "Language-Team: Basque <debian-l10n-basque@lists.debian.org>\n"
@@ -19,29 +19,29 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 "X-Generator: Lokalize 1.0\n"
 
-#: dselect/basecmds.cc:125
+#: dselect/basecmds.cc
 msgid "Search for ? "
 msgstr "Bilatu hau: "
 
-#: dselect/basecmds.cc:149
+#: dselect/basecmds.cc
 msgid "Error: "
 msgstr "Errorea: "
 
-#: dselect/basecmds.cc:180
+#: dselect/basecmds.cc
 msgid "Help: "
 msgstr "Laguntza: "
 
-#: dselect/basecmds.cc:186
+#: dselect/basecmds.cc
 msgid "Press ? for help menu, . for next topic, <space> to exit help."
 msgstr ""
 "Sakatu ? laguntza-menua ikusteko, '.' hurrengo gaira joateko, <zuriunea> "
 "laguntzatik irteteko."
 
-#: dselect/basecmds.cc:193
+#: dselect/basecmds.cc
 msgid "Help information is available under the following topics:"
 msgstr "Laguntzako informazioa gai hauetan dago erabilgarri:"
 
-#: dselect/basecmds.cc:201
+#: dselect/basecmds.cc
 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. "
@@ -49,239 +49,239 @@ msgstr ""
 "Sakatu goiko zerrendako tekla bat,  <zuriunea> edo 'q' laguntzatik irteteko\n"
 " edo '.' (puntua) laguntza-orriak banan-banan irakurtzeko. "
 
-#: dselect/basecmds.cc:207
+#: dselect/basecmds.cc
 msgid "error reading keyboard in help"
 msgstr "errorea laguntzan teklatua irakurtzean"
 
-#: dselect/baselist.cc:60
+#: dselect/baselist.cc
 msgid "ioctl(TIOCGWINSZ) failed"
 msgstr "ioctl(TIOCGWINSZ): huts egin du"
 
-#: dselect/baselist.cc:63
+#: dselect/baselist.cc
 msgid "doupdate in SIGWINCH handler failed"
 msgstr "doupdate: huts egin du SIGWINCH kudeatzailean"
 
-#: dselect/baselist.cc:72
+#: dselect/baselist.cc
 msgid "failed to restore old SIGWINCH sigact"
 msgstr "huts egin du SIGWINCHen sigact zaharra leheneratzean"
 
-#: dselect/baselist.cc:75
+#: dselect/baselist.cc
 msgid "failed to restore old signal mask"
 msgstr "huts egin du seinale-maskara zaharra leheneratzean"
 
-#: dselect/baselist.cc:86
+#: dselect/baselist.cc
 msgid "failed to get old signal mask"
 msgstr "huts egin du seinale-maskara zaharra hartzean"
 
-#: dselect/baselist.cc:88
+#: dselect/baselist.cc
 msgid "failed to get old SIGWINCH sigact"
 msgstr "huts egin du SIGWINCH sigact zaharra hartzean"
 
-#: dselect/baselist.cc:93
+#: dselect/baselist.cc
 msgid "failed to block SIGWINCH"
 msgstr "huts egin du SIGWINCH blokeatzean"
 
-#: dselect/baselist.cc:99
+#: dselect/baselist.cc
 msgid "failed to set new SIGWINCH sigact"
 msgstr "huts egin du SIGWINCH sigact berria ezartzean"
 
-#: dselect/baselist.cc:174
+#: dselect/baselist.cc
 msgid "failed to allocate colour pair"
 msgstr "huts egin du kolore-bikotea esleitzean"
 
-#: dselect/baselist.cc:203
+#: dselect/baselist.cc
 msgid "failed to create title window"
 msgstr "huts egin du leihoaren titulua sortzean"
 
-#: dselect/baselist.cc:207
+#: dselect/baselist.cc
 msgid "failed to create whatinfo window"
 msgstr "huts egin du 'whatinfo' leihoa sortzean"
 
-#: dselect/baselist.cc:211
+#: dselect/baselist.cc
 msgid "failed to create baselist pad"
 msgstr "huts egin du oinarrizko zerrendako zona sortzean"
 
-#: dselect/baselist.cc:214
+#: dselect/baselist.cc
 msgid "failed to create heading pad"
 msgstr "huts egin du izenburuen zona sortzean"
 
-#: dselect/baselist.cc:218
+#: dselect/baselist.cc
 msgid "failed to create thisstate pad"
 msgstr "huts egin du egoeraren zona sortzean"
 
-#: dselect/baselist.cc:222
+#: dselect/baselist.cc
 msgid "failed to create info pad"
 msgstr "huts egin du informazioaren zona sortzean"
 
-#: dselect/baselist.cc:227
+#: dselect/baselist.cc
 msgid "failed to create query window"
 msgstr "huts egin du kontsulta-leihoa sortzean"
 
-#: dselect/baselist.cc:298
+#: dselect/baselist.cc
 msgid "Keybindings"
 msgstr "Laster-teklak"
 
-#: dselect/baselist.cc:347
+#: dselect/baselist.cc
 #, c-format
 msgid "  -- %d%%, press "
 msgstr "  -- %d%%, sakatu "
 
-#: dselect/baselist.cc:350
+#: dselect/baselist.cc
 #, c-format
 msgid "%s for more"
 msgstr "%s gehiagorako"
 
-#: dselect/baselist.cc:354
+#: dselect/baselist.cc
 #, c-format
 msgid "%s to go back"
 msgstr "%s atzera joateko"
 
-#: dselect/bindings.cc:78
+#: dselect/bindings.cc
 msgid "[not bound]"
 msgstr "[lotu gabe]"
 
-#: dselect/bindings.cc:82
+#: dselect/bindings.cc
 #, c-format
 msgid "[unk: %d]"
 msgstr "[ezezaguna: %d]"
 
-#: dselect/bindings.cc:141
+#: dselect/bindings.cc
 msgid "Scroll onwards through help/information"
 msgstr "Korritu aurrera laguntzan/informazioan"
 
-#: dselect/bindings.cc:142
+#: dselect/bindings.cc
 msgid "Scroll backwards through help/information"
 msgstr "Korritu atzera laguntzan/informazioan"
 
-#: dselect/bindings.cc:143
+#: dselect/bindings.cc
 msgid "Move up"
 msgstr "Eraman gorantz"
 
-#: dselect/bindings.cc:144
+#: dselect/bindings.cc
 msgid "Move down"
 msgstr "Eraman beherantz"
 
-#: dselect/bindings.cc:145
+#: dselect/bindings.cc
 msgid "Go to top of list"
 msgstr "Joan zerrendaren hasierara"
 
-#: dselect/bindings.cc:146
+#: dselect/bindings.cc
 msgid "Go to end of list"
 msgstr "Joan zerrendaren amaierara"
 
-#: dselect/bindings.cc:147
+#: dselect/bindings.cc
 msgid "Request help (cycle through help screens)"
 msgstr "Eskatu laguntza (joan laguntza-pantaila batetik bestera)"
 
-#: dselect/bindings.cc:148
+#: dselect/bindings.cc
 msgid "Cycle through information displays"
 msgstr "Joan informazio-pantaila batetik bestera"
 
-#: dselect/bindings.cc:149
+#: dselect/bindings.cc
 msgid "Redraw display"
 msgstr "Marraztu berriro pantaila"
 
-#: dselect/bindings.cc:150
+#: dselect/bindings.cc
 msgid "Scroll onwards through list by 1 line"
 msgstr "Korritu aurrera zerrendan lerro 1"
 
-#: dselect/bindings.cc:151
+#: dselect/bindings.cc
 msgid "Scroll backwards through list by 1 line"
 msgstr "Korritu atzera zerrendan lerro 1"
 
-#: dselect/bindings.cc:152
+#: dselect/bindings.cc
 msgid "Scroll onwards through help/information by 1 line"
 msgstr "Korritu aurrera laguntzan/informazioan lerro 1"
 
-#: dselect/bindings.cc:153
+#: dselect/bindings.cc
 msgid "Scroll backwards through help/information by 1 line"
 msgstr "Korritu atzera laguntzan/informazioan lerro 1"
 
-#: dselect/bindings.cc:154
+#: dselect/bindings.cc
 msgid "Scroll onwards through list"
 msgstr "Korritu aurrera zerrendan"
 
-#: dselect/bindings.cc:155
+#: dselect/bindings.cc
 msgid "Scroll backwards through list"
 msgstr "Korritu atzera zerrendan"
 
-#: dselect/bindings.cc:158
+#: dselect/bindings.cc
 msgid "Mark package(s) for installation"
 msgstr "Markatu paketea(k) instalatzeko"
 
-#: dselect/bindings.cc:159
+#: dselect/bindings.cc
 msgid "Mark package(s) for deinstallation"
 msgstr "Markatu paketea(k) desinstalatzeko"
 
-#: dselect/bindings.cc:160
+#: dselect/bindings.cc
 msgid "Mark package(s) for deinstall and purge"
 msgstr "Markatu paketea(k) desinstalatzeko eta purgatzeko"
 
-#: dselect/bindings.cc:161
+#: dselect/bindings.cc
 msgid "Make highlight more specific"
 msgstr "Nabarmendu zehatzago"
 
-#: dselect/bindings.cc:162
+#: dselect/bindings.cc
 msgid "Make highlight less specific"
 msgstr "Nabarmendu zehaztasun gutxiagoz"
 
-#: dselect/bindings.cc:163
+#: dselect/bindings.cc
 msgid "Search for a package whose name contains a string"
 msgstr "Bilatu izenean kate bat duen pakete bat"
 
-#: dselect/bindings.cc:164
+#: dselect/bindings.cc
 msgid "Repeat last search"
 msgstr "Errepikatu azken bilaketa"
 
-#: dselect/bindings.cc:165
+#: dselect/bindings.cc
 msgid "Swap sort order priority/section"
 msgstr "Aldatu lehentasuna/sekzioa ordenatzeko irizpidea"
 
-#: dselect/bindings.cc:166
+#: dselect/bindings.cc
 msgid "Quit, confirming, and checking dependencies"
 msgstr "Irten, berretsiz eta mendekotasunak egiaztatuz"
 
-#: dselect/bindings.cc:167
+#: dselect/bindings.cc
 msgid "Quit, confirming without check"
 msgstr "Irten, egiaztatu gabe berretsiz"
 
-#: dselect/bindings.cc:168
+#: dselect/bindings.cc
 msgid "Quit, rejecting conflict/dependency suggestions"
 msgstr "Irten, gatazka/mendekotasuna iradokizunak ezetsiz"
 
-#: dselect/bindings.cc:169
+#: dselect/bindings.cc
 msgid "Abort - quit without making changes"
 msgstr "Abortatu - irten aldaketarik egin gabe"
 
-#: dselect/bindings.cc:170
+#: dselect/bindings.cc
 msgid "Revert to old state for all packages"
 msgstr "Leheneratu pakete guztiak egoera zaharrera"
 
-#: dselect/bindings.cc:171
+#: dselect/bindings.cc
 msgid "Revert to suggested state for all packages"
 msgstr "Leheneratu pakete guztiak iradokitako egoerara"
 
-#: dselect/bindings.cc:172
+#: dselect/bindings.cc
 msgid "Revert to directly requested state for all packages"
 msgstr "Leheneratu pakete guztiak zuzenean eskatutako egoerara"
 
-#: dselect/bindings.cc:173
+#: dselect/bindings.cc
 msgid "Revert to currently installed state for all packages"
 msgstr "Leheneratu pakete guztiak unean instalaturik dagoen egoerara"
 
-#: dselect/bindings.cc:176
+#: dselect/bindings.cc
 msgid "Select currently-highlighted access method"
 msgstr "Hautatu unean nabarmendutako atzipen-metodoa"
 
-#: dselect/bindings.cc:177
+#: dselect/bindings.cc
 msgid "Quit without changing selected access method"
 msgstr "Irten hautatutako atzipen-metodoa aldatu gabe"
 
-#: dselect/helpmsgs.cc:29
+#: dselect/helpmsgs.cc
 msgid "Keystrokes"
 msgstr "Tekla-sakatzeak"
 
-#: dselect/helpmsgs.cc:29
+#: dselect/helpmsgs.cc
 #, fuzzy
 #| msgid ""
 #| "Motion keys: Next/Previous, Top/End, Up/Down, Backwards/Forwards:\n"
@@ -376,11 +376,11 @@ msgstr ""
 "   D     ezarri dena zuzenean eskatutako egoeran \n"
 "                                            \\   Errepikatu azken bilaketa\n"
 
-#: dselect/helpmsgs.cc:55
+#: dselect/helpmsgs.cc
 msgid "Introduction to package selections"
 msgstr "Pakete-hautapenen sarrera"
 
-#: dselect/helpmsgs.cc:55
+#: dselect/helpmsgs.cc
 msgid ""
 "Welcome to dselect's main package listing.\n"
 "\n"
@@ -433,11 +433,11 @@ msgstr ""
 "\n"
 "Sakatu <sartu> laguntzatik irten eta zerrendara joateko.\n"
 
-#: dselect/helpmsgs.cc:80
+#: dselect/helpmsgs.cc
 msgid "Introduction to read-only package list browser"
 msgstr "Soilik irakurtzeko paketeen zerrendaren arakatzailearen sarrera"
 
-#: dselect/helpmsgs.cc:80
+#: dselect/helpmsgs.cc
 msgid ""
 "Welcome to dselect's main package listing.\n"
 "\n"
@@ -473,11 +473,11 @@ msgstr ""
 "\n"
 "Sakatu <sartu> laguntzatik irten eta zerrendara joateko.\n"
 
-#: dselect/helpmsgs.cc:99
+#: dselect/helpmsgs.cc
 msgid "Introduction to conflict/dependency resolution sub-list"
 msgstr "Gatazka/mendekotasuna ebazteko azpizerrendaren sarrera"
 
-#: dselect/helpmsgs.cc:99
+#: dselect/helpmsgs.cc
 msgid ""
 "Dependency/conflict resolution - introduction.\n"
 "\n"
@@ -540,11 +540,11 @@ msgstr ""
 "Sakatu <sartu> laguntzatik irten eta azpizerrendara joateko; gogoratu: "
 "laguntza behar izanez gero, sakatu '?'.\n"
 
-#: dselect/helpmsgs.cc:125
+#: dselect/helpmsgs.cc
 msgid "Display, part 1: package listing and status chars"
 msgstr "Bistaratzea, 1. zatia: paketeen zerrenda eta egoera-karaktereak"
 
-#: dselect/helpmsgs.cc:125
+#: dselect/helpmsgs.cc
 msgid ""
 "The top half of the screen shows a list of packages.  For each package you "
 "see\n"
@@ -610,11 +610,11 @@ msgstr ""
 "erabilgarri dauden bertsio-zenbakiak bistaratzen dira (maiuskula-V \n"
 "bistaratzeko/ezkutatzeko), baita laburpenaren azalpena ere.\n"
 
-#: dselect/helpmsgs.cc:152
+#: dselect/helpmsgs.cc
 msgid "Display, part 2: list highlight; information display"
 msgstr "Bistaratzea, 2. zatia: zerrenda nabarmentzea; informazioa bistaratzea"
 
-#: dselect/helpmsgs.cc:152
+#: dselect/helpmsgs.cc
 msgid ""
 "* Highlight: One line in the package list will be highlighted.  It "
 "indicates\n"
@@ -663,11 +663,11 @@ msgstr ""
 "  Erabili 'i' tekla pantailetan zehar mugitzeko, eta 'I' informazioa\n"
 "  ezkutatzeko edo ia pantaila osoa erabiltzeko zabaltzeko.\n"
 
-#: dselect/helpmsgs.cc:176
+#: dselect/helpmsgs.cc
 msgid "Introduction to method selection display"
 msgstr "Metodo-hautapenaren sarrera"
 
-#: dselect/helpmsgs.cc:176
+#: dselect/helpmsgs.cc
 msgid ""
 "dselect and dpkg can do automatic installation, loading the package files to "
 "be\n"
@@ -712,11 +712,11 @@ msgstr ""
 "menura\n"
 " '?' sakatuta\n"
 
-#: dselect/helpmsgs.cc:196
+#: dselect/helpmsgs.cc
 msgid "Keystrokes for method selection"
 msgstr "Metodoa hautatzeko tekla-sakatzeak"
 
-#: dselect/helpmsgs.cc:196
+#: dselect/helpmsgs.cc
 msgid ""
 "Motion keys: Next/Previous, Top/End, Up/Down, Backwards/Forwards:\n"
 "  j, Down-arrow         k, Up-arrow             move highlight\n"
@@ -765,104 +765,104 @@ msgstr ""
 "  /                bilatu (uzteko, sakatu 'sartu')\n"
 "  \\               errepikatu azken bilaketa\n"
 
-#: dselect/main.cc:63
+#: dselect/main.cc
 msgid "Type dselect --help for help."
 msgstr "Idatzi dselect --help laguntza lortzeko."
 
-#: dselect/main.cc:145
+#: dselect/main.cc
 msgid "a"
 msgstr "a"
 
-#: dselect/main.cc:145
+#: dselect/main.cc
 msgid "[A]ccess"
 msgstr "[A]tzipena"
 
-#: dselect/main.cc:145
+#: dselect/main.cc
 msgid "Choose the access method to use."
 msgstr "Aukeratu erabili nahi duzun atzipen-metodoa."
 
-#: dselect/main.cc:146
+#: dselect/main.cc
 msgid "u"
 msgstr "e"
 
-#: dselect/main.cc:146
+#: dselect/main.cc
 msgid "[U]pdate"
 msgstr "[E]guneratu"
 
-#: dselect/main.cc:146
+#: dselect/main.cc
 msgid "Update list of available packages, if possible."
 msgstr "Ahal bada, eguneratu pakete erabilgarrien zerrenda."
 
-#: dselect/main.cc:147
+#: dselect/main.cc
 msgid "s"
 msgstr "h"
 
-#: dselect/main.cc:147
+#: dselect/main.cc
 msgid "[S]elect"
 msgstr "[H]autatu"
 
-#: dselect/main.cc:147
+#: dselect/main.cc
 msgid "Request which packages you want on your system."
 msgstr "Eskatu sisteman izan nahi dituzun paketeak."
 
-#: dselect/main.cc:148
+#: dselect/main.cc
 msgid "i"
 msgstr "i"
 
-#: dselect/main.cc:148
+#: dselect/main.cc
 msgid "[I]nstall"
 msgstr "[I]nstalatu"
 
-#: dselect/main.cc:148
+#: dselect/main.cc
 msgid "Install and upgrade wanted packages."
 msgstr "Instalatu eta bertsio-berritu nahi dituzun paketeak."
 
-#: dselect/main.cc:149
+#: dselect/main.cc
 msgid "c"
 msgstr "k"
 
-#: dselect/main.cc:149
+#: dselect/main.cc
 msgid "[C]onfig"
 msgstr "[K]onfiguratu"
 
-#: dselect/main.cc:149
+#: dselect/main.cc
 msgid "Configure any packages that are unconfigured."
 msgstr "Konfiguratu konfiguratu gabe dauden paketeak."
 
-#: dselect/main.cc:150
+#: dselect/main.cc
 msgid "r"
 msgstr "e"
 
-#: dselect/main.cc:150
+#: dselect/main.cc
 msgid "[R]emove"
 msgstr "K[e]ndu"
 
-#: dselect/main.cc:150
+#: dselect/main.cc
 msgid "Remove unwanted software."
 msgstr "Kendu nahi ez duzun softwarea."
 
-#: dselect/main.cc:151
+#: dselect/main.cc
 msgid "q"
 msgstr "r"
 
-#: dselect/main.cc:151
+#: dselect/main.cc
 msgid "[Q]uit"
 msgstr "I[r]ten"
 
-#: dselect/main.cc:151
+#: dselect/main.cc
 msgid "Quit dselect."
 msgstr "Irten dselect-etik."
 
-#: dselect/main.cc:152
+#: dselect/main.cc
 msgid "menu"
 msgstr "menua"
 
-#: dselect/main.cc:157
+#: dselect/main.cc
 #, c-format
 msgid "Debian `%s' package handling frontend version %s.\n"
 msgstr "Debian-en pakete kudeatzeko '%s' interfazearen %s bertsioa.\n"
 
-#: dselect/main.cc:160
+#: dselect/main.cc
 msgid ""
 "This is free software; see the GNU General Public License version 2 or\n"
 "later for copying conditions. There is NO warranty.\n"
@@ -871,29 +871,47 @@ msgstr ""
 "GNU Lizentzia Publiko Orokorraren 2 bertsioa edo berriagoa.\n"
 "EZ dago bermerik.\n"
 
-#: dselect/main.cc:169 dselect/main.cc:217
+#: dselect/main.cc
 msgid "<standard output>"
 msgstr "<irteera estandarra>"
 
-#: dselect/main.cc:180
-#, c-format
+#: dselect/main.cc
+#, fuzzy, c-format
+#| msgid ""
+#| "Usage: %s [<option> ...] [<action> ...]\n"
+#| "\n"
 msgid ""
-"Usage: %s [<option> ...] [<action> ...]\n"
+"Usage: %s [<option>...] [<command>...]\n"
 "\n"
 msgstr ""
 "Erabilera: %s [<aukera> ...] [<aukera> ...]\n"
 "\n"
 
-#: dselect/main.cc:184
+#: dselect/main.cc
 #, c-format
+msgid "Commands:\n"
+msgstr ""
+
+#: dselect/main.cc
+#, fuzzy, c-format
+#| msgid ""
+#| "Options:\n"
+#| "  --admindir <directory>     Use <directory> instead of %s.\n"
+#| "  --expert                   Turn on expert mode.\n"
+#| "  --debug <file> | -D<file>  Turn on debugging, sending output to "
+#| "<file>.\n"
+#| "  --colour | --color screenpart:[foreground],[background][:attr[+attr"
+#| "+...]]\n"
+#| "                             Configure screen colours.\n"
+#| "\n"
 msgid ""
 "Options:\n"
-"  --admindir <directory>     Use <directory> instead of %s.\n"
-"  --expert                   Turn on expert mode.\n"
-"  --debug <file> | -D<file>  Turn on debugging, sending output to <file>.\n"
-"  --colour | --color screenpart:[foreground],[background][:attr[+attr+...]]\n"
-"                             Configure screen colours.\n"
-"\n"
+"      --admindir <directory>       Use <directory> instead of %s.\n"
+"      --expert                     Turn on expert mode.\n"
+"  -D, --debug <file>               Turn on debugging, send output to "
+"<file>.\n"
+"      --color <color-spec>         Configure screen colors.\n"
+"      --colour <color-spec>        Ditto.\n"
 msgstr ""
 "Aukerak:\n"
 "  --admindir <direktorioa>  Erabili <direktorioa> %s ordez.\n"
@@ -905,72 +923,79 @@ msgstr ""
 "                             Konfiguratu pantailaren koloreak.\n"
 "\n"
 
-#: dselect/main.cc:193
-#, c-format
+#: dselect/main.cc
+#, fuzzy, c-format
+#| msgid ""
+#| "  --help                     Show this help message.\n"
+#| "  --version                  Show the version.\n"
+#| "\n"
 msgid ""
-"  --help                     Show this help message.\n"
-"  --version                  Show the version.\n"
+"  -?, --help                       Show this help message.\n"
+"      --version                    Show the version.\n"
 "\n"
 msgstr ""
 "  --help                     Erakutsi laguntzaren testu hau\n"
 "  --version                 Erakutsi  bertsioa.\n"
 "\n"
 
-#: dselect/main.cc:197
+#: dselect/main.cc
 #, c-format
-msgid "Actions:\n"
-msgstr "Ekintzak:\n"
+msgid ""
+"<color-spec> is <screen-part>:[<foreground>],[<background>][:"
+"<attr>[+<attr>]...]\n"
+msgstr ""
 
-#: dselect/main.cc:202
-#, c-format
-msgid "Screenparts:\n"
+#: dselect/main.cc
+#, fuzzy, c-format
+#| msgid "Screenparts:\n"
+msgid "<screen-part> is:"
 msgstr "Pantaila-zatiak:\n"
 
-#: dselect/main.cc:207
+#: dselect/main.cc
 #, c-format
-msgid "Colours:\n"
-msgstr "Koloreak:\n"
+msgid "<color> is:"
+msgstr ""
 
-#: dselect/main.cc:212
+#: dselect/main.cc
 #, c-format
-msgid "Attributes:\n"
-msgstr "Atributuak:\n"
+msgid "<attr> is:"
+msgstr ""
 
-#: dselect/main.cc:232
+#: dselect/main.cc
 #, c-format
 msgid "couldn't open debug file `%.255s'\n"
 msgstr "ezin izan da '%.255s' arazketa-fitxategia ireki\n"
 
-#: dselect/main.cc:253
+#: dselect/main.cc
 #, c-format
 msgid "invalid %s '%s'"
 msgstr "%s '%s' baliogabea"
 
-#: dselect/main.cc:272
+#: dselect/main.cc
 msgid "screen part"
 msgstr "pantaila-zatia"
 
-#: dselect/main.cc:278
+#: dselect/main.cc
 msgid "null colour specification"
 msgstr "Kolore-zehaztapen nulua"
 
-#: dselect/main.cc:286 dselect/main.cc:291
+#: dselect/main.cc
 msgid "colour"
 msgstr "kolorea"
 
-#: dselect/main.cc:299
+#: dselect/main.cc
 msgid "colour attribute"
 msgstr "kolore-atributua"
 
-#: dselect/main.cc:333
+#: dselect/main.cc
 msgid "Terminal does not appear to support cursor addressing.\n"
 msgstr "Badirudi terminalak ez duela onartzen kurtsore-helbideratzerik.\n"
 
-#: dselect/main.cc:335
+#: dselect/main.cc
 msgid "Terminal does not appear to support highlighting.\n"
 msgstr "Badirudi terminalak ez duela onartzen nabarmentzea.\n"
 
-#: dselect/main.cc:337
+#: dselect/main.cc
 #, c-format
 msgid ""
 "Set your TERM variable correctly, use a better terminal,\n"
@@ -979,11 +1004,11 @@ msgstr ""
 "Ezarri ondo TERM aldagaia, erabili terminal hobe bat,\n"
 "edo moldatu paketez pakete kudeatzeko %s tresnarekin .\n"
 
-#: dselect/main.cc:340
+#: dselect/main.cc
 msgid "terminal lacks necessary features, giving up"
 msgstr "terminalak beharrezko eginbide batzuk falta ditu, utzi egingo da"
 
-#: dselect/main.cc:425
+#: dselect/main.cc
 msgid ""
 "\n"
 "\n"
@@ -998,7 +1023,7 @@ msgstr ""
 "Hautatzeko, sakatu <sartu>. Erabili ^L pantaila berriro marrazteko.\n"
 "\n"
 
-#: dselect/main.cc:430
+#: dselect/main.cc
 msgid ""
 "Copyright (C) 1994-1996 Ian Jackson.\n"
 "Copyright (C) 2000,2001 Wichert Akkerman.\n"
@@ -1006,7 +1031,7 @@ msgstr ""
 "Copyright (C) 1994-1996 Ian Jackson.\n"
 "Copyright (C) 2000,2001 Wichert Akkerman.\n"
 
-#: dselect/main.cc:436
+#: dselect/main.cc
 msgid ""
 "\n"
 "\n"
@@ -1016,57 +1041,57 @@ msgstr ""
 "\n"
 "Soilik irakurtzeko sarbidea: hautapenen aurrebista bakarrik dago erabilgarri!"
 
-#: dselect/main.cc:455
+#: dselect/main.cc
 msgid "failed to getch in main menu"
 msgstr "getch: huts egin du menu nagusian"
 
-#: dselect/main.cc:538
+#: dselect/main.cc
 #, c-format
 msgid "unknown action string `%.50s'"
 msgstr "'%.50s' ekintza-kate ezezaguna"
 
-#: dselect/methlist.cc:66
+#: dselect/methlist.cc
 msgid "Abbrev."
 msgstr "Laburd."
 
-#: dselect/methlist.cc:67 dselect/pkgdisplay.cc:188 dselect/pkginfo.cc:110
+#: dselect/methlist.cc dselect/pkgdisplay.cc dselect/pkginfo.cc
 msgid "Description"
 msgstr "Azalpena"
 
-#: dselect/methlist.cc:73
+#: dselect/methlist.cc
 msgid "dselect - list of access methods"
 msgstr "dselect - atzipen-metodoen zerrenda"
 
-#: dselect/methlist.cc:82
+#: dselect/methlist.cc
 #, c-format
 msgid "Access method `%s'."
 msgstr "'%s' atzipen-metodoa."
 
-#: dselect/methlist.cc:161 dselect/pkglist.cc:587
+#: dselect/methlist.cc dselect/pkglist.cc
 msgid "doupdate failed"
 msgstr "doupdate: huts egin du"
 
-#: dselect/methlist.cc:164 dselect/pkglist.cc:590
+#: dselect/methlist.cc dselect/pkglist.cc
 msgid "failed to unblock SIGWINCH"
 msgstr "huts egin du SIGWINCH desblokeatzean"
 
-#: dselect/methlist.cc:169 dselect/pkglist.cc:595
+#: dselect/methlist.cc dselect/pkglist.cc
 msgid "failed to re-block SIGWINCH"
 msgstr "huts egin du SIGWINCH birblokeatzean"
 
-#: dselect/methlist.cc:170 dselect/pkglist.cc:597
+#: dselect/methlist.cc dselect/pkglist.cc
 msgid "getch failed"
 msgstr "getch: huts egin du"
 
-#: dselect/methlist.cc:187
+#: dselect/methlist.cc
 msgid "Explanation"
 msgstr "Azalpena"
 
-#: dselect/methlist.cc:197
+#: dselect/methlist.cc
 msgid "No explanation available."
 msgstr "Ez dago azalpen erabilgarririk."
 
-#: dselect/method.cc:67
+#: dselect/method.cc
 #, c-format
 msgid ""
 "\n"
@@ -1077,7 +1102,7 @@ msgstr ""
 "\n"
 "%s: %s\n"
 
-#: dselect/method.cc:70
+#: dselect/method.cc
 msgid ""
 "\n"
 "Press <enter> to continue."
@@ -1085,191 +1110,201 @@ msgstr ""
 "\n"
 "Jarraitzeko, sakatu <sartu>."
 
-#: dselect/method.cc:82
+#: dselect/method.cc
 msgid "cannot unlock access method area"
 msgstr ""
 
-#: dselect/method.cc:96
+#: dselect/method.cc
 #, fuzzy
 #| msgid " does not appear to be available\n"
 msgid "no access methods are available"
 msgstr " : ez dirudi erabilgarri dagoenik\n"
 
-#: dselect/method.cc:115
+#: dselect/method.cc
 msgid "requested operation requires superuser privilege"
 msgstr ""
 
-#: dselect/method.cc:118
+#: dselect/method.cc
 #, fuzzy
 #| msgid "Choose the access method to use."
 msgid "cannot open or create access method lockfile"
 msgstr "Aukeratu erabili nahi duzun atzipen-metodoa."
 
-#: dselect/method.cc:125
+#: dselect/method.cc
 msgid "the access method area is already locked"
 msgstr ""
 
-#: dselect/method.cc:128
+#: dselect/method.cc
 #, fuzzy
 #| msgid "dselect - list of access methods"
 msgid "cannot lock access method area"
 msgstr "dselect - atzipen-metodoen zerrenda"
 
-#: dselect/method.cc:161
+#: dselect/method.cc
 #, c-format
 msgid "Press <enter> to continue.\n"
 msgstr "Jarraitzeko, sakatu <sartu>.\n"
 
-#: dselect/method.cc:162
+#: dselect/method.cc
 msgid "<standard error>"
 msgstr "<errore estandarra>"
 
-#: dselect/method.cc:165
+#: dselect/method.cc
 msgid "error reading acknowledgement of program failure message"
 msgstr "errorea programa-hutsegitearen mezuaren adierazpena irakurtzean"
 
-#: dselect/method.cc:187
+#: dselect/method.cc
 msgid "no access method is selected or configured"
 msgstr ""
 
-#: dselect/method.cc:196
+#: dselect/method.cc
 msgid "update available list script"
 msgstr "erabilgarri-zerrenda eguneratzeko script-a"
 
-#: dselect/method.cc:200
+#: dselect/method.cc
 msgid "installation script"
 msgstr "instalazioaren script-a"
 
-#: dselect/method.cc:246
+#: dselect/method.cc
 msgid "query/setup script"
 msgstr "kontsultaren/instalazioaren script-a"
 
-#: dselect/methparse.cc:53
+#: dselect/methparse.cc
 #, c-format
 msgid "syntax error in method options file `%.250s' -- %s"
 msgstr "sintaxi-errorea metodo-aukeren fitxategian: '%.250s' -- %s"
 
-#: dselect/methparse.cc:59
+#: dselect/methparse.cc
 #, c-format
 msgid "error reading options file `%.250s'"
 msgstr "errorea '%.250s' aukeren fitxategia irakurtzean"
 
-#: dselect/methparse.cc:93
+#: dselect/methparse.cc
 #, c-format
 msgid "unable to read `%.250s' directory for reading methods"
 msgstr "ezin da irakurri '%.250s' direktorioa irakurketa-metodoetan"
 
-#: dselect/methparse.cc:109
+#: dselect/methparse.cc
 #, c-format
 msgid "method `%.250s' has name that is too long (%d > %d characters)"
 msgstr "'%.250s' metodoak izen luzeegia dauka (%d > %d karaktere)"
 
-#: dselect/methparse.cc:120
+#: dselect/methparse.cc
 #, c-format
 msgid "unable to access method script `%.250s'"
 msgstr "ezin da atzitu '%.250s' metodoaren script-a"
 
-#: dselect/methparse.cc:126
+#: dselect/methparse.cc
 #, c-format
 msgid "unable to read method options file `%.250s'"
 msgstr "ezin da irakurri '%.250s' metodo-aukeren fitxategia"
 
-#: dselect/methparse.cc:150
+#: dselect/methparse.cc
 msgid "non-digit where digit wanted"
 msgstr "digituak ez direnak digituak behar diren lekuan"
 
-#: dselect/methparse.cc:153
-msgid "EOF in index string"
+#: dselect/methparse.cc
+#, fuzzy
+#| msgid "EOF in index string"
+msgid "end of file in index string"
 msgstr "EOF indize-katean"
 
-#: dselect/methparse.cc:156
+#: dselect/methparse.cc
 msgid "index string too long"
 msgstr "indize-kate luzeegia"
 
-#: dselect/methparse.cc:159
+#: dselect/methparse.cc
 msgid "newline before option name start"
 msgstr "lerro-jauzia aukera-izenaren hasieraren aurretik"
 
-#: dselect/methparse.cc:161
-msgid "EOF before option name start"
-msgstr "EOF aukera-izenaren hasieraren aurretik"
+#: dselect/methparse.cc
+#, fuzzy
+#| msgid "newline before option name start"
+msgid "end of file before option name start"
+msgstr "lerro-jauzia aukera-izenaren hasieraren aurretik"
 
-#: dselect/methparse.cc:165
+#: dselect/methparse.cc
 msgid "nonalpha where option name start wanted"
 msgstr "alfanumerikoak ez direnak aukera-izenaren hasiera nahi zenean"
 
-#: dselect/methparse.cc:167
+#: dselect/methparse.cc
 msgid "non-alphanum in option name"
 msgstr "alfanumerikoak ez direnak aukera-izenean"
 
-#: dselect/methparse.cc:170
-msgid "EOF in option name"
+#: dselect/methparse.cc
+#, fuzzy
+#| msgid "EOF in option name"
+msgid "end of file in option name"
 msgstr "EOF aukera-izenean"
 
-#: dselect/methparse.cc:175
+#: dselect/methparse.cc
 msgid "newline before summary"
 msgstr "lerro-jauzia laburpenaren aurretik"
 
-#: dselect/methparse.cc:177
-msgid "EOF before summary"
-msgstr "EOF laburpenaren aurretik"
+#: dselect/methparse.cc
+#, fuzzy
+#| msgid "newline before summary"
+msgid "end of file before summary"
+msgstr "lerro-jauzia laburpenaren aurretik"
 
-#: dselect/methparse.cc:183
-msgid "EOF in summary - missing newline"
+#: dselect/methparse.cc
+#, fuzzy
+#| msgid "EOF in summary - missing newline"
+msgid "end of file in summary - missing newline"
 msgstr "EOF laburpenean - lerro-jauzia falta da"
 
-#: dselect/methparse.cc:193
+#: dselect/methparse.cc
 #, c-format
 msgid "unable to open option description file `%.250s'"
 msgstr "ezin da ireki aukeren azalpeneko '%.250s' fitxategia"
 
-#: dselect/methparse.cc:197
+#: dselect/methparse.cc
 #, c-format
 msgid "unable to stat option description file `%.250s'"
 msgstr "ezin da atzitu aukeren azalpeneko '%.250s' fitxategia"
 
-#: dselect/methparse.cc:201
+#: dselect/methparse.cc
 #, c-format
 msgid "failed to read option description file `%.250s'"
 msgstr "ezin da irakurri aukeren azalpeneko '%.250s' fitxategia"
 
-#: dselect/methparse.cc:204
+#: dselect/methparse.cc
 #, c-format
 msgid "error during read of option description file `%.250s'"
 msgstr "errorea aukeren azalpeneko '%.250s' fitxategia irakurtzean"
 
-#: dselect/methparse.cc:227
+#: dselect/methparse.cc
 #, c-format
 msgid "error during read of method options file `%.250s'"
 msgstr "errorea metodo-aukeren '%.250s' fitxategia irakurtzean"
 
-#: dselect/methparse.cc:250
+#: dselect/methparse.cc
 #, c-format
 msgid "unable to open current option file `%.250s'"
 msgstr "ezin da ireki aukeren azalpeneko '%.250s' fitxategia"
 
-#: dselect/methparse.cc:286
+#: dselect/methparse.cc
 #, c-format
 msgid "unable to write new option to `%.250s'"
 msgstr "ezin da idatzi aukera berria: '%.250s'"
 
-#: dselect/pkgdisplay.cc:36
+#: dselect/pkgdisplay.cc
 msgid "new package"
 msgstr "pakete berria"
 
-#: dselect/pkgdisplay.cc:37
+#: dselect/pkgdisplay.cc
 msgid "install"
 msgstr "instalatu"
 
-#: dselect/pkgdisplay.cc:38
+#: dselect/pkgdisplay.cc
 msgid "hold"
 msgstr "atxiki"
 
-#: dselect/pkgdisplay.cc:39
+#: dselect/pkgdisplay.cc
 msgid "remove"
 msgstr "kendu"
 
-#: dselect/pkgdisplay.cc:40
+#: dselect/pkgdisplay.cc
 msgid "purge"
 msgstr "purgatu"
 
@@ -1277,331 +1312,325 @@ msgstr "purgatu"
 #. * the empty string to store information about the translation. DO NOT
 #. * CHANGE THAT IN A TRANSLATION! The code really relies on that being
 #. * a single space.
-#: dselect/pkgdisplay.cc:47
+#: dselect/pkgdisplay.cc
 msgid " "
 msgstr " "
 
-#: dselect/pkgdisplay.cc:48
+#: dselect/pkgdisplay.cc
 msgid "REINSTALL"
 msgstr "BERRINSTALATU"
 
-#: dselect/pkgdisplay.cc:51
+#: dselect/pkgdisplay.cc
 msgid "not installed"
 msgstr "ez dago instalatuta"
 
-#: dselect/pkgdisplay.cc:52
+#: dselect/pkgdisplay.cc
 msgid "removed (configs remain)"
 msgstr "kenduta (konfiguratzea falta da)"
 
-#: dselect/pkgdisplay.cc:53
+#: dselect/pkgdisplay.cc
 msgid "half installed"
 msgstr "erdi-instalatuta"
 
-#: dselect/pkgdisplay.cc:54
+#: dselect/pkgdisplay.cc
 msgid "unpacked (not set up)"
 msgstr "deskonprimituta (konfiguratu gabe)"
 
-#: dselect/pkgdisplay.cc:55
+#: dselect/pkgdisplay.cc
 msgid "half configured (config failed)"
 msgstr "erdi-konfiguratuta (konfigurazioak huts eginda)"
 
-#: dselect/pkgdisplay.cc:56
+#: dselect/pkgdisplay.cc
 msgid "awaiting trigger processing"
 msgstr "abiarazle prozesatzea itxoiten"
 
-#: dselect/pkgdisplay.cc:57
+#: dselect/pkgdisplay.cc
 msgid "triggered"
 msgstr "abiarazita"
 
-#: dselect/pkgdisplay.cc:58
+#: dselect/pkgdisplay.cc
 msgid "installed"
 msgstr "instalatuta"
 
-#: dselect/pkgdisplay.cc:61
+#: dselect/pkgdisplay.cc
 msgid "Required"
 msgstr "Beharrezkoa"
 
-#: dselect/pkgdisplay.cc:62
+#: dselect/pkgdisplay.cc
 msgid "Important"
 msgstr "Garrantzizkoa"
 
-#: dselect/pkgdisplay.cc:63
+#: dselect/pkgdisplay.cc
 msgid "Standard"
 msgstr "Estandarra"
 
-#: dselect/pkgdisplay.cc:64
+#: dselect/pkgdisplay.cc
 msgid "Optional"
 msgstr "Aukerakoa"
 
-#: dselect/pkgdisplay.cc:65
+#: dselect/pkgdisplay.cc
 msgid "Extra"
 msgstr "Estra"
 
-#: dselect/pkgdisplay.cc:66
-msgid "!Bug!"
-msgstr "Programa-errorea"
-
-#: dselect/pkgdisplay.cc:67
+#: dselect/pkgdisplay.cc
 msgid "Unclassified"
 msgstr "Sailkatu gabe"
 
-#: dselect/pkgdisplay.cc:70
+#: dselect/pkgdisplay.cc
 msgid "suggests"
 msgstr "hau iradokitzen du:"
 
-#: dselect/pkgdisplay.cc:71
+#: dselect/pkgdisplay.cc
 msgid "recommends"
 msgstr "hau gomendatzen du:"
 
-#: dselect/pkgdisplay.cc:72
+#: dselect/pkgdisplay.cc
 msgid "depends on"
 msgstr "honen mendekoa da:"
 
-#: dselect/pkgdisplay.cc:73
+#: dselect/pkgdisplay.cc
 msgid "pre-depends on"
 msgstr "honen aurremendekoa da:"
 
-#: dselect/pkgdisplay.cc:74
+#: dselect/pkgdisplay.cc
 msgid "breaks"
 msgstr "hau hondatzen du: "
 
-#: dselect/pkgdisplay.cc:75
+#: dselect/pkgdisplay.cc
 msgid "conflicts with"
 msgstr "gatazkan dago honekin:"
 
-#: dselect/pkgdisplay.cc:76
+#: dselect/pkgdisplay.cc
 msgid "provides"
 msgstr "hau hornitzen du:"
 
-#: dselect/pkgdisplay.cc:77
+#: dselect/pkgdisplay.cc
 msgid "replaces"
 msgstr "hau ordezten du:"
 
-#: dselect/pkgdisplay.cc:78
+#: dselect/pkgdisplay.cc
 msgid "enhances"
 msgstr "hau hobetzen du:"
 
-#: dselect/pkgdisplay.cc:81
+#: dselect/pkgdisplay.cc
 msgid "Req"
 msgstr "Beh."
 
-#: dselect/pkgdisplay.cc:82
+#: dselect/pkgdisplay.cc
 msgid "Imp"
 msgstr "Gar."
 
-#: dselect/pkgdisplay.cc:83
+#: dselect/pkgdisplay.cc
 msgid "Std"
 msgstr "Estd."
 
-#: dselect/pkgdisplay.cc:84
+#: dselect/pkgdisplay.cc
 msgid "Opt"
 msgstr "Auk."
 
-#: dselect/pkgdisplay.cc:85
+#: dselect/pkgdisplay.cc
 msgid "Xtr"
 msgstr "Xtr"
 
-#: dselect/pkgdisplay.cc:86
+#: dselect/pkgdisplay.cc
 msgid "bUG"
 msgstr "pER"
 
-#: dselect/pkgdisplay.cc:87
+#: dselect/pkgdisplay.cc
 msgid "?"
 msgstr "?"
 
-#: dselect/pkgdisplay.cc:95 dselect/pkgdisplay.cc:115
+#: dselect/pkgdisplay.cc
 msgid "Broken"
 msgstr "Hautsita"
 
-#: dselect/pkgdisplay.cc:96
+#: dselect/pkgdisplay.cc
 msgid "New"
 msgstr "Berria"
 
-#: dselect/pkgdisplay.cc:97
-msgid "Updated"
-msgstr "Eguneratuta"
+#: dselect/pkgdisplay.cc
+msgid "Upgradable"
+msgstr ""
 
-#: dselect/pkgdisplay.cc:98
+#: dselect/pkgdisplay.cc
 msgid "Obsolete/local"
 msgstr "Zaharkitua/lokala"
 
-#: dselect/pkgdisplay.cc:99
-msgid "Up-to-date"
-msgstr "Eguneratuta"
+#: dselect/pkgdisplay.cc
+msgid "Installed"
+msgstr "Instalatuta"
 
-#: dselect/pkgdisplay.cc:100
+#: dselect/pkgdisplay.cc
 msgid "Available"
 msgstr "Erabilgarri"
 
-#: dselect/pkgdisplay.cc:101 dselect/pkgdisplay.cc:117
+#: dselect/pkgdisplay.cc
 msgid "Removed"
 msgstr "Kenduta"
 
-#: dselect/pkgdisplay.cc:102 dselect/pkgdisplay.cc:111
+#: dselect/pkgdisplay.cc
 msgid "Brokenly installed packages"
 msgstr "Gaizki instalatutako paketeak"
 
-#: dselect/pkgdisplay.cc:103
+#: dselect/pkgdisplay.cc
 msgid "Newly available packages"
 msgstr "Pakete erabilgarri berriak"
 
-#: dselect/pkgdisplay.cc:104
-msgid "Updated packages (newer version is available)"
-msgstr "Eguneratutako paketeak (bertsio berriago bat erabilgarri dago)"
+#: dselect/pkgdisplay.cc
+#, fuzzy
+#| msgid "Newly available packages"
+msgid "Upgradable packages"
+msgstr "Pakete erabilgarri berriak"
 
-#: dselect/pkgdisplay.cc:105
-msgid "Obsolete and local packages present on system"
+#: dselect/pkgdisplay.cc
+#, fuzzy
+#| msgid "Obsolete and local packages present on system"
+msgid "Obsolete and locally created packages"
 msgstr "Sisteman dauden pakete zaharkituak eta lokalak"
 
-#: dselect/pkgdisplay.cc:106
-msgid "Up to date installed packages"
-msgstr "Egunera dauden instalatutako paketeak (ez dago bertsio berriagorik)"
+#: dselect/pkgdisplay.cc
+msgid "Installed packages"
+msgstr "Instalatutako paketeak"
 
-#: dselect/pkgdisplay.cc:107
-msgid "Available packages (not currently installed)"
-msgstr "Pakete erabilgarriak (ez daude instalatuta)"
+#: dselect/pkgdisplay.cc
+#, fuzzy
+#| msgid "Up to date installed packages"
+msgid "Available not installed packages"
+msgstr "Egunera dauden instalatutako paketeak (ez dago bertsio berriagorik)"
 
-#: dselect/pkgdisplay.cc:108
+#: dselect/pkgdisplay.cc
 msgid "Removed and no longer available packages"
 msgstr "Kendu diren eta orain erabilgarri ez dauden paketeak"
 
-#: dselect/pkgdisplay.cc:112
-msgid "Installed packages"
-msgstr "Instalatutako paketeak"
-
-#: dselect/pkgdisplay.cc:113
+#: dselect/pkgdisplay.cc
 msgid "Removed packages (configuration still present)"
 msgstr "Kendutako paketeak (konfigurazioa badago oraindik)"
 
-#: dselect/pkgdisplay.cc:114
+#: dselect/pkgdisplay.cc
 msgid "Purged packages and those never installed"
 msgstr "Purgatutako paketeak eta inoiz instalatu ez direnak"
 
-#: dselect/pkgdisplay.cc:116
-msgid "Installed"
-msgstr "Instalatuta"
-
-#: dselect/pkgdisplay.cc:118
+#: dselect/pkgdisplay.cc
 msgid "Purged"
 msgstr "Purgatuta"
 
-#: dselect/pkgdisplay.cc:138
+#: dselect/pkgdisplay.cc
 msgid "Error"
 msgstr "Errorea"
 
-#: dselect/pkgdisplay.cc:139
+#: dselect/pkgdisplay.cc
 msgid "Installed?"
 msgstr "Instalatuta?"
 
-#: dselect/pkgdisplay.cc:140
+#: dselect/pkgdisplay.cc
 msgid "Old mark"
 msgstr "Marka zaharra"
 
-#: dselect/pkgdisplay.cc:141
+#: dselect/pkgdisplay.cc
 msgid "Marked for"
 msgstr "Honela markatua:"
 
-#: dselect/pkgdisplay.cc:143
+#: dselect/pkgdisplay.cc
 msgid "EIOM"
 msgstr "EIOM"
 
-#: dselect/pkgdisplay.cc:147 dselect/pkgdisplay.cc:150
+#: dselect/pkgdisplay.cc
 msgid "Section"
 msgstr "Sekzioa"
 
-#: dselect/pkgdisplay.cc:148
+#: dselect/pkgdisplay.cc
 msgid "Priority"
 msgstr "Lehentasuna"
 
-#: dselect/pkgdisplay.cc:152
+#: dselect/pkgdisplay.cc
 msgid "Package"
 msgstr "Paketea"
 
-#: dselect/pkgdisplay.cc:161 dselect/pkgdisplay.cc:165
+#: dselect/pkgdisplay.cc
 #, fuzzy
 #| msgid "Avail.ver"
 msgid "Avail.arch"
 msgstr "Berts. erabilg."
 
-#: dselect/pkgdisplay.cc:164
+#: dselect/pkgdisplay.cc
 #, fuzzy
 #| msgid "Inst.ver"
 msgid "Inst.arch"
 msgstr "Inst. berts."
 
-#: dselect/pkgdisplay.cc:178 dselect/pkgdisplay.cc:182
+#: dselect/pkgdisplay.cc
 msgid "Avail.ver"
 msgstr "Berts. erabilg."
 
-#: dselect/pkgdisplay.cc:181
+#: dselect/pkgdisplay.cc
 msgid "Inst.ver"
 msgstr "Inst. berts."
 
-#: dselect/pkgdisplay.cc:197
+#: dselect/pkgdisplay.cc
 msgid "dselect - recursive package listing"
 msgstr "dselect - paketeen zerrenda errekurtsiboa"
 
-#: dselect/pkgdisplay.cc:199
+#: dselect/pkgdisplay.cc
 msgid "dselect - inspection of package states"
 msgstr "dselect - pakete-egoeraren egiaztapena"
 
-#: dselect/pkgdisplay.cc:200
+#: dselect/pkgdisplay.cc
 msgid "dselect - main package listing"
 msgstr "dselect - paketeen zerrenda nagusia"
 
-#: dselect/pkgdisplay.cc:208
+#: dselect/pkgdisplay.cc
 msgid " (by section)"
 msgstr " (sekzioaren arabera)"
 
-#: dselect/pkgdisplay.cc:211
+#: dselect/pkgdisplay.cc
 msgid " (avail., section)"
 msgstr " (erabilg., sekzioa)"
 
-#: dselect/pkgdisplay.cc:214
+#: dselect/pkgdisplay.cc
 msgid " (status, section)"
 msgstr " (egoera, sekzioa)"
 
-#: dselect/pkgdisplay.cc:223
+#: dselect/pkgdisplay.cc
 msgid " (by priority)"
 msgstr " (lehentasunaren arabera)"
 
-#: dselect/pkgdisplay.cc:226
+#: dselect/pkgdisplay.cc
 msgid " (avail., priority)"
 msgstr " (erabilg., lehentasuna)"
 
-#: dselect/pkgdisplay.cc:229
+#: dselect/pkgdisplay.cc
 msgid " (status, priority)"
 msgstr " (egoera, lehentasuna)"
 
-#: dselect/pkgdisplay.cc:238
+#: dselect/pkgdisplay.cc
 msgid " (alphabetically)"
 msgstr " (alfabetikoki)"
 
-#: dselect/pkgdisplay.cc:241
+#: dselect/pkgdisplay.cc
 msgid " (by availability)"
 msgstr " (erabilgarritasunaren arabera)"
 
-#: dselect/pkgdisplay.cc:244
+#: dselect/pkgdisplay.cc
 msgid " (by status)"
 msgstr " (egoeraren arabera)"
 
-#: dselect/pkgdisplay.cc:259
+#: dselect/pkgdisplay.cc
 msgid " mark:+/=/- terse:v help:?"
 msgstr " marka:+/=/- labur:v laguntza:?"
 
-#: dselect/pkgdisplay.cc:260
+#: dselect/pkgdisplay.cc
 msgid " mark:+/=/- verbose:v help:?"
 msgstr " marka:+/=/- xeheki:v laguntza:?"
 
-#: dselect/pkgdisplay.cc:262
+#: dselect/pkgdisplay.cc
 msgid " terse:v help:?"
 msgstr " labur:v laguntza:?"
 
-#: dselect/pkgdisplay.cc:263
+#: dselect/pkgdisplay.cc
 msgid " verbose:v help:?"
 msgstr " xeheki:v laguntza:?"
 
-#: dselect/pkginfo.cc:85
+#: dselect/pkginfo.cc
 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 "
@@ -1621,80 +1650,110 @@ msgstr ""
 "Erabili 'o' eta 'O' ordena aldatzeko eta aukera izateko talde-mota "
 "desberdinetako paketeak markatzeko."
 
-#: dselect/pkginfo.cc:98
+#: dselect/pkginfo.cc
 msgid "Interrelationships"
 msgstr "interrelazioak"
 
-#: dselect/pkginfo.cc:117
+#: dselect/pkginfo.cc
 msgid "No description available."
 msgstr "Ez dago azalpen erabilgarririk."
 
-#: dselect/pkginfo.cc:135
+#: dselect/pkginfo.cc
 msgid "Installed control file information"
 msgstr "instalatutako kontrol fitxategiaren informazioa"
 
-#: dselect/pkginfo.cc:151
+#: dselect/pkginfo.cc
 msgid "Available control file information"
 msgstr "Kontrol fitxategiaren informazio erabilgarria"
 
-#: dselect/pkglist.cc:425
+#: dselect/pkglist.cc
 msgid "there are no packages"
 msgstr "ez dago paketerik"
 
-#: dselect/pkglist.cc:521
+#: dselect/pkglist.cc
 msgid "invalid search option given"
 msgstr "bilaketa-aukera baliogabea eman da"
 
-#: dselect/pkglist.cc:536
+#: dselect/pkglist.cc
 msgid "error in regular expression"
 msgstr "errorea adierazpen erregularrean"
 
-#: dselect/pkgsublist.cc:111
+#: dselect/pkgsublist.cc
 msgid " does not appear to be available\n"
 msgstr " : ez dirudi erabilgarri dagoenik\n"
 
-#: dselect/pkgsublist.cc:131
+#: dselect/pkgsublist.cc
 msgid " or "
 msgstr " edo "
 
-#: dselect/pkgtop.cc:58
+#: dselect/pkgtop.cc
 msgid "All"
 msgstr "Denak"
 
-#: dselect/pkgtop.cc:80
+#: dselect/pkgtop.cc
 msgid "All packages"
 msgstr "Pakete guztiak"
 
-#: dselect/pkgtop.cc:84
+#: dselect/pkgtop.cc
 #, c-format
 msgid "%s packages without a section"
 msgstr "%s pakete sekziorik gabe"
 
-#: dselect/pkgtop.cc:86
+#: dselect/pkgtop.cc
 #, c-format
 msgid "%s packages in section %s"
 msgstr "%s pakete %s sekzioan"
 
-#: dselect/pkgtop.cc:92
+#: dselect/pkgtop.cc
 #, c-format
 msgid "%s %s packages"
 msgstr "%s %s paketeak"
 
-#: dselect/pkgtop.cc:96
+#: dselect/pkgtop.cc
 #, c-format
 msgid "%s %s packages without a section"
 msgstr "%s %s pakete sekziorik gabe"
 
-#: dselect/pkgtop.cc:98
+#: dselect/pkgtop.cc
 #, c-format
 msgid "%s %s packages in section %s"
 msgstr "%s %s pakete %s sekzioan"
 
-#: dselect/pkgtop.cc:119
+#: dselect/pkgtop.cc
 #, c-format
 msgid "%-*s %s%s%s;  %s (was: %s).  %s"
 msgstr "%-*s %s%s%s;  %s (lehen: %s).  %s"
 
+#~ msgid "Actions:\n"
+#~ msgstr "Ekintzak:\n"
+
+#~ msgid "Colours:\n"
+#~ msgstr "Koloreak:\n"
+
+#~ msgid "Attributes:\n"
+#~ msgstr "Atributuak:\n"
+
+#~ msgid "EOF before option name start"
+#~ msgstr "EOF aukera-izenaren hasieraren aurretik"
+
+#~ msgid "EOF before summary"
+#~ msgstr "EOF laburpenaren aurretik"
+
+#~ msgid "!Bug!"
+#~ msgstr "Programa-errorea"
+
+#~ msgid "Updated"
+#~ msgstr "Eguneratuta"
+
+#~ msgid "Up-to-date"
+#~ msgstr "Eguneratuta"
+
+#~ msgid "Updated packages (newer version is available)"
+#~ msgstr "Eguneratutako paketeak (bertsio berriago bat erabilgarri dago)"
+
+#~ msgid "Available packages (not currently installed)"
+#~ msgstr "Pakete erabilgarriak (ez daude instalatuta)"
+
 #~ msgid "foreign architectures enabled but multi-arch is not supported"
 #~ msgstr ""
 #~ "Kanpoko arkitekturak gaituta, baina arkitektura anitza ez dago onartuta"
diff --git a/dselect/po/fr.po b/dselect/po/fr.po
index 992a77a1b..5f10631bb 100644
--- a/dselect/po/fr.po
+++ b/dselect/po/fr.po
@@ -50,7 +50,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dselect 1.17.0\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2014-12-23 18:12+0100\n"
+"POT-Creation-Date: 2015-04-06 09:37+0200\n"
 "PO-Revision-Date: 2014-10-31 18:10-0400\n"
 "Last-Translator: Sébastien Poher <sbphr@volted.net>\n"
 "Language-Team: French <debian-l10n-french@lists.debian.org>\n"
@@ -61,29 +61,29 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 "X-Generator: Lokalize 1.4\n"
 
-#: dselect/basecmds.cc:125
+#: dselect/basecmds.cc
 msgid "Search for ? "
 msgstr "Rechercher ?"
 
-#: dselect/basecmds.cc:149
+#: dselect/basecmds.cc
 msgid "Error: "
 msgstr "Erreur : "
 
-#: dselect/basecmds.cc:180
+#: dselect/basecmds.cc
 msgid "Help: "
 msgstr "Aide : "
 
-#: dselect/basecmds.cc:186
+#: dselect/basecmds.cc
 msgid "Press ? for help menu, . for next topic, <space> to exit help."
 msgstr ""
 "Appuyez sur ? pour un menu d'aide, . pour le sujet suivant, <espace> pour "
 "quitter l'aide."
 
-#: dselect/basecmds.cc:193
+#: dselect/basecmds.cc
 msgid "Help information is available under the following topics:"
 msgstr "L'information d'aide est accessible au travers des thèmes suivants :"
 
-#: dselect/basecmds.cc:201
+#: dselect/basecmds.cc
 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. "
@@ -92,239 +92,239 @@ msgstr ""
 "de l'aide,\n"
 " ou . pour lire chaque page tour à tour. "
 
-#: dselect/basecmds.cc:207
+#: dselect/basecmds.cc
 msgid "error reading keyboard in help"
 msgstr "erreur de lecture du clavier dans l'aide"
 
-#: dselect/baselist.cc:60
+#: dselect/baselist.cc
 msgid "ioctl(TIOCGWINSZ) failed"
 msgstr "échec de « ioctl(TIOCGWINSZ) »"
 
-#: dselect/baselist.cc:63
+#: dselect/baselist.cc
 msgid "doupdate in SIGWINCH handler failed"
 msgstr "échec de doupdate dans le gestionnaire de SIGWINCH"
 
-#: dselect/baselist.cc:72
+#: dselect/baselist.cc
 msgid "failed to restore old SIGWINCH sigact"
 msgstr "impossible de réinstaller l'ancien sigact de SIGWINCH"
 
-#: dselect/baselist.cc:75
+#: dselect/baselist.cc
 msgid "failed to restore old signal mask"
 msgstr "impossible de réinstaller l'ancien masque de signal"
 
-#: dselect/baselist.cc:86
+#: dselect/baselist.cc
 msgid "failed to get old signal mask"
 msgstr "impossible de récupérer l'ancien masque de signal"
 
-#: dselect/baselist.cc:88
+#: dselect/baselist.cc
 msgid "failed to get old SIGWINCH sigact"
 msgstr "impossible de récupérer l'ancien sigact de SIGWINCH"
 
-#: dselect/baselist.cc:93
+#: dselect/baselist.cc
 msgid "failed to block SIGWINCH"
 msgstr "impossible de bloquer SIGWINCH"
 
-#: dselect/baselist.cc:99
+#: dselect/baselist.cc
 msgid "failed to set new SIGWINCH sigact"
 msgstr "impossible de positionner le nouveau sigact de SIGWINCH"
 
-#: dselect/baselist.cc:174
+#: dselect/baselist.cc
 msgid "failed to allocate colour pair"
 msgstr "impossible d'allouer une paire de couleurs"
 
-#: dselect/baselist.cc:203
+#: dselect/baselist.cc
 msgid "failed to create title window"
 msgstr "impossible de créer la fenêtre de titre"
 
-#: dselect/baselist.cc:207
+#: dselect/baselist.cc
 msgid "failed to create whatinfo window"
 msgstr "impossible de créer la fenêtre d'à propos"
 
-#: dselect/baselist.cc:211
+#: dselect/baselist.cc
 msgid "failed to create baselist pad"
 msgstr "impossible de créer la zone de liste de base"
 
-#: dselect/baselist.cc:214
+#: dselect/baselist.cc
 msgid "failed to create heading pad"
 msgstr "impossible de créer la zone d'en-tête"
 
-#: dselect/baselist.cc:218
+#: dselect/baselist.cc
 msgid "failed to create thisstate pad"
 msgstr "impossible de créer la zone d'état"
 
-#: dselect/baselist.cc:222
+#: dselect/baselist.cc
 msgid "failed to create info pad"
 msgstr "impossible de créer la zone d'info"
 
-#: dselect/baselist.cc:227
+#: dselect/baselist.cc
 msgid "failed to create query window"
 msgstr "impossible de créer la fenêtre de requête"
 
-#: dselect/baselist.cc:298
+#: dselect/baselist.cc
 msgid "Keybindings"
 msgstr "Affectations de touches"
 
-#: dselect/baselist.cc:347
+#: dselect/baselist.cc
 #, c-format
 msgid "  -- %d%%, press "
 msgstr "  -- %d%%, appuyez sur "
 
-#: dselect/baselist.cc:350
+#: dselect/baselist.cc
 #, c-format
 msgid "%s for more"
 msgstr "%s pour plus d'informations"
 
-#: dselect/baselist.cc:354
+#: dselect/baselist.cc
 #, c-format
 msgid "%s to go back"
 msgstr "%s pour revenir en arrière"
 
-#: dselect/bindings.cc:78
+#: dselect/bindings.cc
 msgid "[not bound]"
 msgstr "[pas de correspondance]"
 
-#: dselect/bindings.cc:82
+#: dselect/bindings.cc
 #, c-format
 msgid "[unk: %d]"
 msgstr "[inconnu : %d]"
 
-#: dselect/bindings.cc:141
+#: dselect/bindings.cc
 msgid "Scroll onwards through help/information"
 msgstr "Faire défiler l'aide/information en avant"
 
-#: dselect/bindings.cc:142
+#: dselect/bindings.cc
 msgid "Scroll backwards through help/information"
 msgstr "Faire défiler l'aide/information en arrière"
 
-#: dselect/bindings.cc:143
+#: dselect/bindings.cc
 msgid "Move up"
 msgstr "Se déplacer vers le haut"
 
-#: dselect/bindings.cc:144
+#: dselect/bindings.cc
 msgid "Move down"
 msgstr "Se déplacer vers le bas"
 
-#: dselect/bindings.cc:145
+#: dselect/bindings.cc
 msgid "Go to top of list"
 msgstr "Aller au début de la liste"
 
-#: dselect/bindings.cc:146
+#: dselect/bindings.cc
 msgid "Go to end of list"
 msgstr "Aller à la fin de la liste"
 
-#: dselect/bindings.cc:147
+#: dselect/bindings.cc
 msgid "Request help (cycle through help screens)"
 msgstr "Demander de l'aide (faire défiler les écrans d'information)"
 
-#: dselect/bindings.cc:148
+#: dselect/bindings.cc
 msgid "Cycle through information displays"
 msgstr "Faire défiler les écrans d'information"
 
-#: dselect/bindings.cc:149
+#: dselect/bindings.cc
 msgid "Redraw display"
 msgstr "Redessiner l'écran"
 
-#: dselect/bindings.cc:150
+#: dselect/bindings.cc
 msgid "Scroll onwards through list by 1 line"
 msgstr "Faire défiler la liste en avant ligne par ligne"
 
-#: dselect/bindings.cc:151
+#: dselect/bindings.cc
 msgid "Scroll backwards through list by 1 line"
 msgstr "Faire défiler la liste en arrière ligne par ligne"
 
-#: dselect/bindings.cc:152
+#: dselect/bindings.cc
 msgid "Scroll onwards through help/information by 1 line"
 msgstr "Faire défiler l'aide/information en avant ligne par ligne"
 
-#: dselect/bindings.cc:153
+#: dselect/bindings.cc
 msgid "Scroll backwards through help/information by 1 line"
 msgstr "Faire défiler l'aide/information en arrière ligne par ligne"
 
-#: dselect/bindings.cc:154
+#: dselect/bindings.cc
 msgid "Scroll onwards through list"
 msgstr "Faire défiler la liste en avant"
 
-#: dselect/bindings.cc:155
+#: dselect/bindings.cc
 msgid "Scroll backwards through list"
 msgstr "Faire défiler la liste en arrière"
 
-#: dselect/bindings.cc:158
+#: dselect/bindings.cc
 msgid "Mark package(s) for installation"
 msgstr "Sélectionner le(s) paquet(s) à installer"
 
-#: dselect/bindings.cc:159
+#: dselect/bindings.cc
 msgid "Mark package(s) for deinstallation"
 msgstr "Sélectionner le(s) paquet(s) à désinstaller"
 
-#: dselect/bindings.cc:160
+#: dselect/bindings.cc
 msgid "Mark package(s) for deinstall and purge"
 msgstr "Sélectionner le(s) paquet(s) à désinstaller et purger"
 
-#: dselect/bindings.cc:161
+#: dselect/bindings.cc
 msgid "Make highlight more specific"
 msgstr "Rendre le surlignage plus explicite"
 
-#: dselect/bindings.cc:162
+#: dselect/bindings.cc
 msgid "Make highlight less specific"
 msgstr "Rendre le surlignage moins explicite"
 
-#: dselect/bindings.cc:163
+#: dselect/bindings.cc
 msgid "Search for a package whose name contains a string"
 msgstr "Rechercher un paquet dont le nom contient une chaîne particulière"
 
-#: dselect/bindings.cc:164
+#: dselect/bindings.cc
 msgid "Repeat last search"
 msgstr "Répéter la dernière recherche"
 
-#: dselect/bindings.cc:165
+#: dselect/bindings.cc
 msgid "Swap sort order priority/section"
 msgstr "Échanger l'ordre du tri priorité/section"
 
-#: dselect/bindings.cc:166
+#: dselect/bindings.cc
 msgid "Quit, confirming, and checking dependencies"
 msgstr "Quitter, confirmer et vérifier les dépendances"
 
-#: dselect/bindings.cc:167
+#: dselect/bindings.cc
 msgid "Quit, confirming without check"
 msgstr "Quitter et confirmer sans vérification"
 
-#: dselect/bindings.cc:168
+#: dselect/bindings.cc
 msgid "Quit, rejecting conflict/dependency suggestions"
 msgstr "Quitter et refuser les suggestions de conflit/dépendance"
 
-#: dselect/bindings.cc:169
+#: dselect/bindings.cc
 msgid "Abort - quit without making changes"
 msgstr "Annuler - quitter sans effectuer de changements"
 
-#: dselect/bindings.cc:170
+#: dselect/bindings.cc
 msgid "Revert to old state for all packages"
 msgstr "Retour à l'ancien état pour tous les paquets"
 
-#: dselect/bindings.cc:171
+#: dselect/bindings.cc
 msgid "Revert to suggested state for all packages"
 msgstr "Retour à l'état suggéré pour tous les paquets"
 
-#: dselect/bindings.cc:172
+#: dselect/bindings.cc
 msgid "Revert to directly requested state for all packages"
 msgstr "Retour à l'état directement demandé pour tous les paquets"
 
-#: dselect/bindings.cc:173
+#: dselect/bindings.cc
 msgid "Revert to currently installed state for all packages"
 msgstr "Retour à l'état actuellement installé pour tous les paquets"
 
-#: dselect/bindings.cc:176
+#: dselect/bindings.cc
 msgid "Select currently-highlighted access method"
 msgstr "Sélectionner la méthode d'accès actuellement surlignée"
 
-#: dselect/bindings.cc:177
+#: dselect/bindings.cc
 msgid "Quit without changing selected access method"
 msgstr "Quitter sans changer la méthode d'accès précédemment sélectionnée"
 
-#: dselect/helpmsgs.cc:29
+#: dselect/helpmsgs.cc
 msgid "Keystrokes"
 msgstr "Combinaisons de touches"
 
-#: dselect/helpmsgs.cc:29
+#: dselect/helpmsgs.cc
 msgid ""
 "Motion keys: Next/Previous, Top/End, Up/Down, Backwards/Forwards:\n"
 "  j, Down-arrow         k, Up-arrow             move highlight\n"
@@ -391,11 +391,11 @@ msgstr ""
 "   D     tout posit. à l'état directem. requis  n, \\  répéter la dernière "
 "recherche\n"
 
-#: dselect/helpmsgs.cc:55
+#: dselect/helpmsgs.cc
 msgid "Introduction to package selections"
 msgstr "Introduction à la sélection des paquets"
 
-#: dselect/helpmsgs.cc:55
+#: dselect/helpmsgs.cc
 msgid ""
 "Welcome to dselect's main package listing.\n"
 "\n"
@@ -453,13 +453,13 @@ msgstr ""
 "\n"
 "Appuyez sur <espace> pour quitter l'aide et voir la liste.\n"
 
-#: dselect/helpmsgs.cc:80
+#: dselect/helpmsgs.cc
 msgid "Introduction to read-only package list browser"
 msgstr ""
 "Introduction à la navigation dans la liste des paquets (mode lecture "
 "seulement)"
 
-#: dselect/helpmsgs.cc:80
+#: dselect/helpmsgs.cc
 msgid ""
 "Welcome to dselect's main package listing.\n"
 "\n"
@@ -499,11 +499,11 @@ msgstr ""
 "\n"
 "Appuyez sur <espace> pour quitter l'aide et accéder à la liste.\n"
 
-#: dselect/helpmsgs.cc:99
+#: dselect/helpmsgs.cc
 msgid "Introduction to conflict/dependency resolution sub-list"
 msgstr "Introduction à la sous-liste de résolution de conflits/dépendances"
 
-#: dselect/helpmsgs.cc:99
+#: dselect/helpmsgs.cc
 msgid ""
 "Dependency/conflict resolution - introduction.\n"
 "\n"
@@ -569,11 +569,11 @@ msgstr ""
 "Appuyez sur <espace> pour quitter l'aide et accéder à la sous-liste ;\n"
 "rappel : appuyez sur « ? » pour obtenir de l'aide.\n"
 
-#: dselect/helpmsgs.cc:125
+#: dselect/helpmsgs.cc
 msgid "Display, part 1: package listing and status chars"
 msgstr "Affichage, 1re partie : liste des paquets et caractères d'état"
 
-#: dselect/helpmsgs.cc:125
+#: dselect/helpmsgs.cc
 msgid ""
 "The top half of the screen shows a list of packages.  For each package you "
 "see\n"
@@ -642,12 +642,12 @@ msgstr ""
 "numéros de versions installée et disponible (shift-V pour afficher/cacher)\n"
 "et une description résumée.\n"
 
-#: dselect/helpmsgs.cc:152
+#: dselect/helpmsgs.cc
 msgid "Display, part 2: list highlight; information display"
 msgstr ""
 "Affichage, 2e partie : surlignage de la liste ; affichage d'informations"
 
-#: dselect/helpmsgs.cc:152
+#: dselect/helpmsgs.cc
 msgid ""
 "* Highlight: One line in the package list will be highlighted.  It "
 "indicates\n"
@@ -700,11 +700,11 @@ msgstr ""
 "  masquer l'affichage d'informations ou l'étendre jusqu'à lui faire prendre\n"
 "  la quasi-totalité de l'écran.\n"
 
-#: dselect/helpmsgs.cc:176
+#: dselect/helpmsgs.cc
 msgid "Introduction to method selection display"
 msgstr "Introduction à la sélection des méthodes"
 
-#: dselect/helpmsgs.cc:176
+#: dselect/helpmsgs.cc
 msgid ""
 "dselect and dpkg can do automatic installation, loading the package files to "
 "be\n"
@@ -745,11 +745,11 @@ msgstr ""
 "Une liste complète des combinaisons de touches est disponible en appuyant\n"
 "ici sur « k », ou depuis le menu d'aide accessible en appuyant sur « ? ».\n"
 
-#: dselect/helpmsgs.cc:196
+#: dselect/helpmsgs.cc
 msgid "Keystrokes for method selection"
 msgstr "Combinaisons de touches pour la sélection de méthodes"
 
-#: dselect/helpmsgs.cc:196
+#: dselect/helpmsgs.cc
 msgid ""
 "Motion keys: Next/Previous, Top/End, Up/Down, Backwards/Forwards:\n"
 "  j, Down-arrow         k, Up-arrow             move highlight\n"
@@ -799,104 +799,104 @@ msgstr ""
 "  /               rechercher (appuyer sur entrée pour annuler)\n"
 "  \\               répéter la dernière recherche\n"
 
-#: dselect/main.cc:63
+#: dselect/main.cc
 msgid "Type dselect --help for help."
 msgstr "Taper dselect --help pour obtenir une aide."
 
-#: dselect/main.cc:145
+#: dselect/main.cc
 msgid "a"
 msgstr "a"
 
-#: dselect/main.cc:145
+#: dselect/main.cc
 msgid "[A]ccess"
 msgstr "[A]ccéder"
 
-#: dselect/main.cc:145
+#: dselect/main.cc
 msgid "Choose the access method to use."
 msgstr "Choisir la méthode d'accès à utiliser"
 
-#: dselect/main.cc:146
+#: dselect/main.cc
 msgid "u"
 msgstr "m"
 
-#: dselect/main.cc:146
+#: dselect/main.cc
 msgid "[U]pdate"
 msgstr "[M]ise à jour"
 
-#: dselect/main.cc:146
+#: dselect/main.cc
 msgid "Update list of available packages, if possible."
 msgstr "Mise à jour de l'information sur les paquets disponibles, si possible."
 
-#: dselect/main.cc:147
+#: dselect/main.cc
 msgid "s"
 msgstr "s"
 
-#: dselect/main.cc:147
+#: dselect/main.cc
 msgid "[S]elect"
 msgstr "[S]électionner"
 
-#: dselect/main.cc:147
+#: dselect/main.cc
 msgid "Request which packages you want on your system."
 msgstr "Sélection des paquets que vous désirez avoir sur votre système."
 
-#: dselect/main.cc:148
+#: dselect/main.cc
 msgid "i"
 msgstr "i"
 
-#: dselect/main.cc:148
+#: dselect/main.cc
 msgid "[I]nstall"
 msgstr "[I]nstaller"
 
-#: dselect/main.cc:148
+#: dselect/main.cc
 msgid "Install and upgrade wanted packages."
 msgstr "Installation et mise à niveau des paquets désirés."
 
-#: dselect/main.cc:149
+#: dselect/main.cc
 msgid "c"
 msgstr "c"
 
-#: dselect/main.cc:149
+#: dselect/main.cc
 msgid "[C]onfig"
 msgstr "[C]onfigurer"
 
-#: dselect/main.cc:149
+#: dselect/main.cc
 msgid "Configure any packages that are unconfigured."
 msgstr "Configuration de tout paquet non configuré."
 
-#: dselect/main.cc:150
+#: dselect/main.cc
 msgid "r"
 msgstr "r"
 
-#: dselect/main.cc:150
+#: dselect/main.cc
 msgid "[R]emove"
 msgstr "[R]etirer"
 
-#: dselect/main.cc:150
+#: dselect/main.cc
 msgid "Remove unwanted software."
 msgstr "Suppression des applications non désirées."
 
-#: dselect/main.cc:151
+#: dselect/main.cc
 msgid "q"
 msgstr "q"
 
-#: dselect/main.cc:151
+#: dselect/main.cc
 msgid "[Q]uit"
 msgstr "[Q]uitter"
 
-#: dselect/main.cc:151
+#: dselect/main.cc
 msgid "Quit dselect."
 msgstr "Quitter dselect."
 
-#: dselect/main.cc:152
+#: dselect/main.cc
 msgid "menu"
 msgstr "menu"
 
-#: dselect/main.cc:157
+#: dselect/main.cc
 #, c-format
 msgid "Debian `%s' package handling frontend version %s.\n"
 msgstr "Interface de gestion de paquets Debian « %s » version %s.\n"
 
-#: dselect/main.cc:160
+#: dselect/main.cc
 msgid ""
 "This is free software; see the GNU General Public License version 2 or\n"
 "later for copying conditions. There is NO warranty.\n"
@@ -905,29 +905,47 @@ msgstr ""
 "Public  License » version 2 ou supérieure pour prendre connaissance des\n"
 "conditions de reproduction. AUCUNE garantie n'est offerte.\n"
 
-#: dselect/main.cc:169 dselect/main.cc:217
+#: dselect/main.cc
 msgid "<standard output>"
 msgstr "<sortie standard>"
 
-#: dselect/main.cc:180
-#, c-format
+#: dselect/main.cc
+#, fuzzy, c-format
+#| msgid ""
+#| "Usage: %s [<option> ...] [<action> ...]\n"
+#| "\n"
 msgid ""
-"Usage: %s [<option> ...] [<action> ...]\n"
+"Usage: %s [<option>...] [<command>...]\n"
 "\n"
 msgstr ""
 "Syntaxe : %s [<option> ...] [<action> ...]\n"
 "\n"
 
-#: dselect/main.cc:184
+#: dselect/main.cc
 #, c-format
+msgid "Commands:\n"
+msgstr ""
+
+#: dselect/main.cc
+#, fuzzy, c-format
+#| msgid ""
+#| "Options:\n"
+#| "  --admindir <directory>     Use <directory> instead of %s.\n"
+#| "  --expert                   Turn on expert mode.\n"
+#| "  --debug <file> | -D<file>  Turn on debugging, sending output to "
+#| "<file>.\n"
+#| "  --colour | --color screenpart:[foreground],[background][:attr[+attr"
+#| "+...]]\n"
+#| "                             Configure screen colours.\n"
+#| "\n"
 msgid ""
 "Options:\n"
-"  --admindir <directory>     Use <directory> instead of %s.\n"
-"  --expert                   Turn on expert mode.\n"
-"  --debug <file> | -D<file>  Turn on debugging, sending output to <file>.\n"
-"  --colour | --color screenpart:[foreground],[background][:attr[+attr+...]]\n"
-"                             Configure screen colours.\n"
-"\n"
+"      --admindir <directory>       Use <directory> instead of %s.\n"
+"      --expert                     Turn on expert mode.\n"
+"  -D, --debug <file>               Turn on debugging, send output to "
+"<file>.\n"
+"      --color <color-spec>         Configure screen colors.\n"
+"      --colour <color-spec>        Ditto.\n"
 msgstr ""
 "Options:\n"
 "  --admindir <répertoire>    Utiliser <répertoire> au lieu de %s ;\n"
@@ -940,72 +958,79 @@ msgstr ""
 "                             Configurer les couleurs d'affichage ;\n"
 "\n"
 
-#: dselect/main.cc:193
-#, c-format
+#: dselect/main.cc
+#, fuzzy, c-format
+#| msgid ""
+#| "  --help                     Show this help message.\n"
+#| "  --version                  Show the version.\n"
+#| "\n"
 msgid ""
-"  --help                     Show this help message.\n"
-"  --version                  Show the version.\n"
+"  -?, --help                       Show this help message.\n"
+"      --version                    Show the version.\n"
 "\n"
 msgstr ""
 "  --help                     Afficher ce message d'aide ;\n"
 "  --version                  Afficher la version ;\n"
 "\n"
 
-#: dselect/main.cc:197
+#: dselect/main.cc
 #, c-format
-msgid "Actions:\n"
-msgstr "Actions :\n"
+msgid ""
+"<color-spec> is <screen-part>:[<foreground>],[<background>][:"
+"<attr>[+<attr>]...]\n"
+msgstr ""
 
-#: dselect/main.cc:202
-#, c-format
-msgid "Screenparts:\n"
+#: dselect/main.cc
+#, fuzzy, c-format
+#| msgid "Screenparts:\n"
+msgid "<screen-part> is:"
 msgstr "Parties de l'écran :\n"
 
-#: dselect/main.cc:207
+#: dselect/main.cc
 #, c-format
-msgid "Colours:\n"
-msgstr "Couleurs :\n"
+msgid "<color> is:"
+msgstr ""
 
-#: dselect/main.cc:212
+#: dselect/main.cc
 #, c-format
-msgid "Attributes:\n"
-msgstr "Attributs :\n"
+msgid "<attr> is:"
+msgstr ""
 
-#: dselect/main.cc:232
+#: dselect/main.cc
 #, c-format
 msgid "couldn't open debug file `%.255s'\n"
 msgstr "impossible d'ouvrir le fichier de débogage « %.255s »\n"
 
-#: dselect/main.cc:253
+#: dselect/main.cc
 #, c-format
 msgid "invalid %s '%s'"
 msgstr "Non valable %s « %s »"
 
-#: dselect/main.cc:272
+#: dselect/main.cc
 msgid "screen part"
 msgstr "Partie de l'écran"
 
-#: dselect/main.cc:278
+#: dselect/main.cc
 msgid "null colour specification"
 msgstr "Spécification de couleur nulle"
 
-#: dselect/main.cc:286 dselect/main.cc:291
+#: dselect/main.cc
 msgid "colour"
 msgstr "couleur"
 
-#: dselect/main.cc:299
+#: dselect/main.cc
 msgid "colour attribute"
 msgstr "attribut de couleur"
 
-#: dselect/main.cc:333
+#: dselect/main.cc
 msgid "Terminal does not appear to support cursor addressing.\n"
 msgstr "Il semble que votre terminal ne supporte pas la gestion du curseur\n"
 
-#: dselect/main.cc:335
+#: dselect/main.cc
 msgid "Terminal does not appear to support highlighting.\n"
 msgstr "Il semble que votre terminal ne supporte pas le surlignage\n"
 
-#: dselect/main.cc:337
+#: dselect/main.cc
 #, c-format
 msgid ""
 "Set your TERM variable correctly, use a better terminal,\n"
@@ -1015,11 +1040,11 @@ msgstr ""
 "un meilleur terminal ou contentez-vous d'une installation\n"
 "paquet par paquet avec l'outil de gestion de paquets %s.\n"
 
-#: dselect/main.cc:340
+#: dselect/main.cc
 msgid "terminal lacks necessary features, giving up"
 msgstr "Il manque d'importantes fonctionnalités au terminal, abandon"
 
-#: dselect/main.cc:425
+#: dselect/main.cc
 msgid ""
 "\n"
 "\n"
@@ -1034,7 +1059,7 @@ msgstr ""
 "Appuyez sur <Entrée> pour confirmer la sélection. ^L pour redessiner "
 "l'écran.\n"
 
-#: dselect/main.cc:430
+#: dselect/main.cc
 msgid ""
 "Copyright (C) 1994-1996 Ian Jackson.\n"
 "Copyright (C) 2000,2001 Wichert Akkerman.\n"
@@ -1042,7 +1067,7 @@ msgstr ""
 "Copyright (C) 1994-1996 Ian Jackson.\n"
 "Copyright (C) 2000,2001 Wichert Akkerman.\n"
 
-#: dselect/main.cc:436
+#: dselect/main.cc
 msgid ""
 "\n"
 "\n"
@@ -1052,57 +1077,57 @@ msgstr ""
 "\n"
 "Accès en lecture seule : seul un aperçu des sélections est disponible !"
 
-#: dselect/main.cc:455
+#: dselect/main.cc
 msgid "failed to getch in main menu"
 msgstr "échec de « getch » dans le menu principal"
 
-#: dselect/main.cc:538
+#: dselect/main.cc
 #, c-format
 msgid "unknown action string `%.50s'"
 msgstr "chaîne d'action inconnue « %.50s »"
 
-#: dselect/methlist.cc:66
+#: dselect/methlist.cc
 msgid "Abbrev."
 msgstr "Abrév."
 
-#: dselect/methlist.cc:67 dselect/pkgdisplay.cc:188 dselect/pkginfo.cc:110
+#: dselect/methlist.cc dselect/pkgdisplay.cc dselect/pkginfo.cc
 msgid "Description"
 msgstr "Description"
 
-#: dselect/methlist.cc:73
+#: dselect/methlist.cc
 msgid "dselect - list of access methods"
 msgstr "dselect - liste des méthodes d'accès"
 
-#: dselect/methlist.cc:82
+#: dselect/methlist.cc
 #, c-format
 msgid "Access method `%s'."
 msgstr "Méthode d'accès « %s »."
 
-#: dselect/methlist.cc:161 dselect/pkglist.cc:587
+#: dselect/methlist.cc dselect/pkglist.cc
 msgid "doupdate failed"
 msgstr "échec de doupdate"
 
-#: dselect/methlist.cc:164 dselect/pkglist.cc:590
+#: dselect/methlist.cc dselect/pkglist.cc
 msgid "failed to unblock SIGWINCH"
 msgstr "échec du déblocage de SIGWINCH"
 
-#: dselect/methlist.cc:169 dselect/pkglist.cc:595
+#: dselect/methlist.cc dselect/pkglist.cc
 msgid "failed to re-block SIGWINCH"
 msgstr "échec du reblocage de SIGWINCH"
 
-#: dselect/methlist.cc:170 dselect/pkglist.cc:597
+#: dselect/methlist.cc dselect/pkglist.cc
 msgid "getch failed"
 msgstr "échec de « getch »"
 
-#: dselect/methlist.cc:187
+#: dselect/methlist.cc
 msgid "Explanation"
 msgstr "Explication"
 
-#: dselect/methlist.cc:197
+#: dselect/methlist.cc
 msgid "No explanation available."
 msgstr "Aucune explication n'est disponible."
 
-#: dselect/method.cc:67
+#: dselect/method.cc
 #, c-format
 msgid ""
 "\n"
@@ -1113,7 +1138,7 @@ msgstr ""
 "\n"
 "%s : %s\n"
 
-#: dselect/method.cc:70
+#: dselect/method.cc
 msgid ""
 "\n"
 "Press <enter> to continue."
@@ -1121,199 +1146,209 @@ msgstr ""
 "\n"
 "Appuyez sur <Entrée> pour continuer."
 
-#: dselect/method.cc:82
+#: dselect/method.cc
 msgid "cannot unlock access method area"
 msgstr "impossible de déverrouiller la zone de méthodes d'accès"
 
-#: dselect/method.cc:96
+#: dselect/method.cc
 msgid "no access methods are available"
 msgstr "aucune méthode d'accès n'est disponible"
 
-#: dselect/method.cc:115
+#: dselect/method.cc
 msgid "requested operation requires superuser privilege"
 msgstr "l'opération demandée requiert les privilèges de super-utilisateur"
 
-#: dselect/method.cc:118
+#: dselect/method.cc
 msgid "cannot open or create access method lockfile"
 msgstr ""
 "impossible d'ouvrir ou de créer le fichier de verrouillage de la méthode "
 "d'accès"
 
-#: dselect/method.cc:125
+#: dselect/method.cc
 msgid "the access method area is already locked"
 msgstr "La zone de méthodes d'accès est déjà verrouillée"
 
-#: dselect/method.cc:128
+#: dselect/method.cc
 msgid "cannot lock access method area"
 msgstr "impossible de verrouiller la zone de méthodes d'accès"
 
-#: dselect/method.cc:161
+#: dselect/method.cc
 #, c-format
 msgid "Press <enter> to continue.\n"
 msgstr "Appuyez sur <Entrée> pour continuer.\n"
 
-#: dselect/method.cc:162
+#: dselect/method.cc
 msgid "<standard error>"
 msgstr "<sortie d'erreur standard>"
 
-#: dselect/method.cc:165
+#: dselect/method.cc
 msgid "error reading acknowledgement of program failure message"
 msgstr ""
 "erreur rencontrée lors de la lecture du message d'acquittement produit par "
 "l'échec du programme"
 
-#: dselect/method.cc:187
+#: dselect/method.cc
 msgid "no access method is selected or configured"
 msgstr "aucune méthode d'accès n'est sélectionnée ni configurée"
 
-#: dselect/method.cc:196
+#: dselect/method.cc
 msgid "update available list script"
 msgstr "mise à jour du script de liste disponible"
 
-#: dselect/method.cc:200
+#: dselect/method.cc
 msgid "installation script"
 msgstr "script d'installation"
 
-#: dselect/method.cc:246
+#: dselect/method.cc
 msgid "query/setup script"
 msgstr "script de requête/configuration"
 
-#: dselect/methparse.cc:53
+#: dselect/methparse.cc
 #, c-format
 msgid "syntax error in method options file `%.250s' -- %s"
 msgstr ""
 "erreur de syntaxe dans le fichier des options de méthode « %.250s » -- %s"
 
-#: dselect/methparse.cc:59
+#: dselect/methparse.cc
 #, c-format
 msgid "error reading options file `%.250s'"
 msgstr "erreur de lecture sur le fichier des options « %.250s »"
 
-#: dselect/methparse.cc:93
+#: dselect/methparse.cc
 #, c-format
 msgid "unable to read `%.250s' directory for reading methods"
 msgstr ""
 "impossible de lire le répertoire « %.250s » pour récupérer les méthodes"
 
-#: dselect/methparse.cc:109
+#: dselect/methparse.cc
 #, c-format
 msgid "method `%.250s' has name that is too long (%d > %d characters)"
 msgstr "le nom de la méthode « %.250s » est trop long ( %d > %d caractères)"
 
-#: dselect/methparse.cc:120
+#: dselect/methparse.cc
 #, c-format
 msgid "unable to access method script `%.250s'"
 msgstr "impossible d'accéder au script de méthode « %.250s »"
 
-#: dselect/methparse.cc:126
+#: dselect/methparse.cc
 #, c-format
 msgid "unable to read method options file `%.250s'"
 msgstr "impossible de lire le fichier des options de méthode « %.250s »"
 
-#: dselect/methparse.cc:150
+#: dselect/methparse.cc
 msgid "non-digit where digit wanted"
 msgstr ""
 "caractère non numérique rencontré alors qu'un caractère numérique est attendu"
 
-#: dselect/methparse.cc:153
-msgid "EOF in index string"
+#: dselect/methparse.cc
+#, fuzzy
+#| msgid "EOF in index string"
+msgid "end of file in index string"
 msgstr "EOF dans la chaîne d'index"
 
-#: dselect/methparse.cc:156
+#: dselect/methparse.cc
 msgid "index string too long"
 msgstr "chaîne d'index trop longue"
 
-#: dselect/methparse.cc:159
+#: dselect/methparse.cc
 msgid "newline before option name start"
 msgstr "saut de ligne précédent le début du nom de l'option"
 
-#: dselect/methparse.cc:161
-msgid "EOF before option name start"
-msgstr "EOF précédant le début du nom de l'option"
+#: dselect/methparse.cc
+#, fuzzy
+#| msgid "newline before option name start"
+msgid "end of file before option name start"
+msgstr "saut de ligne précédent le début du nom de l'option"
 
-#: dselect/methparse.cc:165
+#: dselect/methparse.cc
 msgid "nonalpha where option name start wanted"
 msgstr ""
 "caractère non alphanumérique rencontré à l'endroit où le nom d'option "
 "devrait commencer"
 
-#: dselect/methparse.cc:167
+#: dselect/methparse.cc
 msgid "non-alphanum in option name"
 msgstr "caractère non alphanumérique dans le nom d'option"
 
-#: dselect/methparse.cc:170
-msgid "EOF in option name"
+#: dselect/methparse.cc
+#, fuzzy
+#| msgid "EOF in option name"
+msgid "end of file in option name"
 msgstr "EOF dans le nom de l'option"
 
-#: dselect/methparse.cc:175
+#: dselect/methparse.cc
 msgid "newline before summary"
 msgstr "saut de ligne précédant le résumé"
 
-#: dselect/methparse.cc:177
-msgid "EOF before summary"
-msgstr "EOF précédant le résumé"
+#: dselect/methparse.cc
+#, fuzzy
+#| msgid "newline before summary"
+msgid "end of file before summary"
+msgstr "saut de ligne précédant le résumé"
 
-#: dselect/methparse.cc:183
-msgid "EOF in summary - missing newline"
+#: dselect/methparse.cc
+#, fuzzy
+#| msgid "EOF in summary - missing newline"
+msgid "end of file in summary - missing newline"
 msgstr "EOF dans le résumé - saut de ligne manquant"
 
-#: dselect/methparse.cc:193
+#: dselect/methparse.cc
 #, c-format
 msgid "unable to open option description file `%.250s'"
 msgstr "impossible d'ouvrir le fichier de description d'option « %.250s »"
 
-#: dselect/methparse.cc:197
+#: dselect/methparse.cc
 #, c-format
 msgid "unable to stat option description file `%.250s'"
 msgstr ""
 "impossible d'analyser le nouveau fichier de description d'option « %.250s »"
 
-#: dselect/methparse.cc:201
+#: dselect/methparse.cc
 #, c-format
 msgid "failed to read option description file `%.250s'"
 msgstr "échec de la lecture du fichier de description d'option « %.250s »"
 
-#: dselect/methparse.cc:204
+#: dselect/methparse.cc
 #, c-format
 msgid "error during read of option description file `%.250s'"
 msgstr ""
 "erreur survenue pendant la lecture du fichier de description d'option `"
 "%.250s »"
 
-#: dselect/methparse.cc:227
+#: dselect/methparse.cc
 #, c-format
 msgid "error during read of method options file `%.250s'"
 msgstr ""
 "erreur survenue pendant l'écriture du fichier des options de méthode "
 "« %.250s »"
 
-#: dselect/methparse.cc:250
+#: dselect/methparse.cc
 #, c-format
 msgid "unable to open current option file `%.250s'"
 msgstr "impossible d'ouvrir le fichier d'option courant « %.250s »"
 
-#: dselect/methparse.cc:286
+#: dselect/methparse.cc
 #, c-format
 msgid "unable to write new option to `%.250s'"
 msgstr "impossible d'écrire une nouvelle option dans « %.250s »"
 
-#: dselect/pkgdisplay.cc:36
+#: dselect/pkgdisplay.cc
 msgid "new package"
 msgstr "nouveau paquet"
 
-#: dselect/pkgdisplay.cc:37
+#: dselect/pkgdisplay.cc
 msgid "install"
 msgstr "installer"
 
-#: dselect/pkgdisplay.cc:38
+#: dselect/pkgdisplay.cc
 msgid "hold"
 msgstr "garder"
 
-#: dselect/pkgdisplay.cc:39
+#: dselect/pkgdisplay.cc
 msgid "remove"
 msgstr "supprimer"
 
-#: dselect/pkgdisplay.cc:40
+#: dselect/pkgdisplay.cc
 msgid "purge"
 msgstr "purger"
 
@@ -1321,327 +1356,321 @@ msgstr "purger"
 #. * the empty string to store information about the translation. DO NOT
 #. * CHANGE THAT IN A TRANSLATION! The code really relies on that being
 #. * a single space.
-#: dselect/pkgdisplay.cc:47
+#: dselect/pkgdisplay.cc
 msgid " "
 msgstr " "
 
-#: dselect/pkgdisplay.cc:48
+#: dselect/pkgdisplay.cc
 msgid "REINSTALL"
 msgstr "RÉINSTALLE"
 
-#: dselect/pkgdisplay.cc:51
+#: dselect/pkgdisplay.cc
 msgid "not installed"
 msgstr "non installé"
 
-#: dselect/pkgdisplay.cc:52
+#: dselect/pkgdisplay.cc
 msgid "removed (configs remain)"
 msgstr "supprimé (la configuration reste)"
 
-#: dselect/pkgdisplay.cc:53
+#: dselect/pkgdisplay.cc
 msgid "half installed"
 msgstr "partiellement installé"
 
-#: dselect/pkgdisplay.cc:54
+#: dselect/pkgdisplay.cc
 msgid "unpacked (not set up)"
 msgstr "décompacté (non configuré)"
 
-#: dselect/pkgdisplay.cc:55
+#: dselect/pkgdisplay.cc
 msgid "half configured (config failed)"
 msgstr "semi-configuré (échec de la configuration)"
 
-#: dselect/pkgdisplay.cc:56
+#: dselect/pkgdisplay.cc
 msgid "awaiting trigger processing"
 msgstr "attente du traitement du déclencheur (« trigger »)"
 
-#: dselect/pkgdisplay.cc:57
+#: dselect/pkgdisplay.cc
 msgid "triggered"
 msgstr "déclenché"
 
-#: dselect/pkgdisplay.cc:58
+#: dselect/pkgdisplay.cc
 msgid "installed"
 msgstr "installé"
 
-#: dselect/pkgdisplay.cc:61
+#: dselect/pkgdisplay.cc
 msgid "Required"
 msgstr "nécessaires"
 
-#: dselect/pkgdisplay.cc:62
+#: dselect/pkgdisplay.cc
 msgid "Important"
 msgstr "importants"
 
-#: dselect/pkgdisplay.cc:63
+#: dselect/pkgdisplay.cc
 msgid "Standard"
 msgstr "standard"
 
-#: dselect/pkgdisplay.cc:64
+#: dselect/pkgdisplay.cc
 msgid "Optional"
 msgstr "optionnels"
 
-#: dselect/pkgdisplay.cc:65
+#: dselect/pkgdisplay.cc
 msgid "Extra"
 msgstr "supplémentaires"
 
-#: dselect/pkgdisplay.cc:66
-msgid "!Bug!"
-msgstr "!Bogue!"
-
-#: dselect/pkgdisplay.cc:67
+#: dselect/pkgdisplay.cc
 msgid "Unclassified"
 msgstr "Non classé"
 
-#: dselect/pkgdisplay.cc:70
+#: dselect/pkgdisplay.cc
 msgid "suggests"
 msgstr "suggère"
 
-#: dselect/pkgdisplay.cc:71
+#: dselect/pkgdisplay.cc
 msgid "recommends"
 msgstr "recommande"
 
-#: dselect/pkgdisplay.cc:72
+#: dselect/pkgdisplay.cc
 msgid "depends on"
 msgstr "dépend de"
 
-#: dselect/pkgdisplay.cc:73
+#: dselect/pkgdisplay.cc
 msgid "pre-depends on"
 msgstr "pré-dépend de"
 
-#: dselect/pkgdisplay.cc:74
+#: dselect/pkgdisplay.cc
 msgid "breaks"
 msgstr "casse"
 
-#: dselect/pkgdisplay.cc:75
+#: dselect/pkgdisplay.cc
 msgid "conflicts with"
 msgstr "entre en conflit avec"
 
-#: dselect/pkgdisplay.cc:76
+#: dselect/pkgdisplay.cc
 msgid "provides"
 msgstr "fournit"
 
-#: dselect/pkgdisplay.cc:77
+#: dselect/pkgdisplay.cc
 msgid "replaces"
 msgstr "remplace"
 
-#: dselect/pkgdisplay.cc:78
+#: dselect/pkgdisplay.cc
 msgid "enhances"
 msgstr "améliore"
 
-#: dselect/pkgdisplay.cc:81
+#: dselect/pkgdisplay.cc
 msgid "Req"
 msgstr "Néc"
 
-#: dselect/pkgdisplay.cc:82
+#: dselect/pkgdisplay.cc
 msgid "Imp"
 msgstr "Imp"
 
-#: dselect/pkgdisplay.cc:83
+#: dselect/pkgdisplay.cc
 msgid "Std"
 msgstr "Std"
 
-#: dselect/pkgdisplay.cc:84
+#: dselect/pkgdisplay.cc
 msgid "Opt"
 msgstr "Opt"
 
-#: dselect/pkgdisplay.cc:85
+#: dselect/pkgdisplay.cc
 msgid "Xtr"
 msgstr "Sup"
 
-#: dselect/pkgdisplay.cc:86
+#: dselect/pkgdisplay.cc
 msgid "bUG"
 msgstr "Bog"
 
-#: dselect/pkgdisplay.cc:87
+#: dselect/pkgdisplay.cc
 msgid "?"
 msgstr "?"
 
-#: dselect/pkgdisplay.cc:95 dselect/pkgdisplay.cc:115
+#: dselect/pkgdisplay.cc
 msgid "Broken"
 msgstr "défectueux"
 
-#: dselect/pkgdisplay.cc:96
+#: dselect/pkgdisplay.cc
 msgid "New"
 msgstr "nouveaux"
 
-#: dselect/pkgdisplay.cc:97
-msgid "Updated"
-msgstr "mis à jour"
+#: dselect/pkgdisplay.cc
+msgid "Upgradable"
+msgstr ""
 
-#: dselect/pkgdisplay.cc:98
+#: dselect/pkgdisplay.cc
 msgid "Obsolete/local"
 msgstr "obsolètes/locaux"
 
-#: dselect/pkgdisplay.cc:99
-msgid "Up-to-date"
-msgstr "à jour"
+#: dselect/pkgdisplay.cc
+msgid "Installed"
+msgstr "Installé"
 
-#: dselect/pkgdisplay.cc:100
+#: dselect/pkgdisplay.cc
 msgid "Available"
 msgstr "disponibles"
 
-#: dselect/pkgdisplay.cc:101 dselect/pkgdisplay.cc:117
+#: dselect/pkgdisplay.cc
 msgid "Removed"
 msgstr "supprimés"
 
-#: dselect/pkgdisplay.cc:102 dselect/pkgdisplay.cc:111
+#: dselect/pkgdisplay.cc
 msgid "Brokenly installed packages"
 msgstr "Paquets incorrectement installés"
 
-#: dselect/pkgdisplay.cc:103
+#: dselect/pkgdisplay.cc
 msgid "Newly available packages"
 msgstr "Paquets nouvellement disponibles"
 
-#: dselect/pkgdisplay.cc:104
-msgid "Updated packages (newer version is available)"
-msgstr "Paquets mis à jour (une version plus récente est disponible)"
+#: dselect/pkgdisplay.cc
+#, fuzzy
+#| msgid "Newly available packages"
+msgid "Upgradable packages"
+msgstr "Paquets nouvellement disponibles"
 
-#: dselect/pkgdisplay.cc:105
-msgid "Obsolete and local packages present on system"
+#: dselect/pkgdisplay.cc
+#, fuzzy
+#| msgid "Obsolete and local packages present on system"
+msgid "Obsolete and locally created packages"
 msgstr "Paquets obsolètes et locaux présents sur le système"
 
-#: dselect/pkgdisplay.cc:106
-msgid "Up to date installed packages"
-msgstr "Paquets à jour installés"
+#: dselect/pkgdisplay.cc
+msgid "Installed packages"
+msgstr "Paquets installés"
 
-#: dselect/pkgdisplay.cc:107
-msgid "Available packages (not currently installed)"
-msgstr "Paquets disponibles (pas installés pour l'instant)"
+#: dselect/pkgdisplay.cc
+#, fuzzy
+#| msgid "Up to date installed packages"
+msgid "Available not installed packages"
+msgstr "Paquets à jour installés"
 
-#: dselect/pkgdisplay.cc:108
+#: dselect/pkgdisplay.cc
 msgid "Removed and no longer available packages"
 msgstr "Paquets supprimés et désormais indisponibles"
 
-#: dselect/pkgdisplay.cc:112
-msgid "Installed packages"
-msgstr "Paquets installés"
-
-#: dselect/pkgdisplay.cc:113
+#: dselect/pkgdisplay.cc
 msgid "Removed packages (configuration still present)"
 msgstr "Paquets supprimés (configuration encore présente)"
 
-#: dselect/pkgdisplay.cc:114
+#: dselect/pkgdisplay.cc
 msgid "Purged packages and those never installed"
 msgstr "Paquets purgés et ceux qui n'ont jamais été installés"
 
-#: dselect/pkgdisplay.cc:116
-msgid "Installed"
-msgstr "Installé"
-
-#: dselect/pkgdisplay.cc:118
+#: dselect/pkgdisplay.cc
 msgid "Purged"
 msgstr "Purgé"
 
-#: dselect/pkgdisplay.cc:138
+#: dselect/pkgdisplay.cc
 msgid "Error"
 msgstr "Erreur"
 
-#: dselect/pkgdisplay.cc:139
+#: dselect/pkgdisplay.cc
 msgid "Installed?"
 msgstr "Installé ?"
 
-#: dselect/pkgdisplay.cc:140
+#: dselect/pkgdisplay.cc
 msgid "Old mark"
 msgstr "Ancienne marque"
 
-#: dselect/pkgdisplay.cc:141
+#: dselect/pkgdisplay.cc
 msgid "Marked for"
 msgstr "Marqué pour"
 
-#: dselect/pkgdisplay.cc:143
+#: dselect/pkgdisplay.cc
 msgid "EIOM"
 msgstr "EIAM"
 
-#: dselect/pkgdisplay.cc:147 dselect/pkgdisplay.cc:150
+#: dselect/pkgdisplay.cc
 msgid "Section"
 msgstr "Section"
 
-#: dselect/pkgdisplay.cc:148
+#: dselect/pkgdisplay.cc
 msgid "Priority"
 msgstr "Priorité"
 
-#: dselect/pkgdisplay.cc:152
+#: dselect/pkgdisplay.cc
 msgid "Package"
 msgstr "Paquet"
 
-#: dselect/pkgdisplay.cc:161 dselect/pkgdisplay.cc:165
+#: dselect/pkgdisplay.cc
 msgid "Avail.arch"
 msgstr "Arch. dispo."
 
-#: dselect/pkgdisplay.cc:164
+#: dselect/pkgdisplay.cc
 msgid "Inst.arch"
 msgstr "Arch. inst"
 
-#: dselect/pkgdisplay.cc:178 dselect/pkgdisplay.cc:182
+#: dselect/pkgdisplay.cc
 msgid "Avail.ver"
 msgstr "Vers. dispo."
 
-#: dselect/pkgdisplay.cc:181
+#: dselect/pkgdisplay.cc
 msgid "Inst.ver"
 msgstr "Vers. inst"
 
-#: dselect/pkgdisplay.cc:197
+#: dselect/pkgdisplay.cc
 msgid "dselect - recursive package listing"
 msgstr "dselect - liste des paquets récursive"
 
-#: dselect/pkgdisplay.cc:199
+#: dselect/pkgdisplay.cc
 msgid "dselect - inspection of package states"
 msgstr "dselect - inspection de l'état des paquets"
 
-#: dselect/pkgdisplay.cc:200
+#: dselect/pkgdisplay.cc
 msgid "dselect - main package listing"
 msgstr "dselect - liste principale des paquets"
 
-#: dselect/pkgdisplay.cc:208
+#: dselect/pkgdisplay.cc
 msgid " (by section)"
 msgstr " (par section)"
 
-#: dselect/pkgdisplay.cc:211
+#: dselect/pkgdisplay.cc
 msgid " (avail., section)"
 msgstr " (dispo., section)"
 
-#: dselect/pkgdisplay.cc:214
+#: dselect/pkgdisplay.cc
 msgid " (status, section)"
 msgstr " (état, section)"
 
-#: dselect/pkgdisplay.cc:223
+#: dselect/pkgdisplay.cc
 msgid " (by priority)"
 msgstr " (par priorité)"
 
-#: dselect/pkgdisplay.cc:226
+#: dselect/pkgdisplay.cc
 msgid " (avail., priority)"
 msgstr " (dispo., priorité)"
 
-#: dselect/pkgdisplay.cc:229
+#: dselect/pkgdisplay.cc
 msgid " (status, priority)"
 msgstr " (état, priorité)"
 
-#: dselect/pkgdisplay.cc:238
+#: dselect/pkgdisplay.cc
 msgid " (alphabetically)"
 msgstr " (alphabétiquement)"
 
-#: dselect/pkgdisplay.cc:241
+#: dselect/pkgdisplay.cc
 msgid " (by availability)"
 msgstr " (par disponibilité)"
 
-#: dselect/pkgdisplay.cc:244
+#: dselect/pkgdisplay.cc
 msgid " (by status)"
 msgstr " (par état)"
 
-#: dselect/pkgdisplay.cc:259
+#: dselect/pkgdisplay.cc
 msgid " mark:+/=/- terse:v help:?"
 msgstr " marq:+/=/- concis:v aide:?"
 
-#: dselect/pkgdisplay.cc:260
+#: dselect/pkgdisplay.cc
 msgid " mark:+/=/- verbose:v help:?"
 msgstr " marq:+/=/- verbeux:v aide:?"
 
-#: dselect/pkgdisplay.cc:262
+#: dselect/pkgdisplay.cc
 msgid " terse:v help:?"
 msgstr " concis:v aide:?"
 
-#: dselect/pkgdisplay.cc:263
+#: dselect/pkgdisplay.cc
 msgid " verbose:v help:?"
 msgstr " verbeux:v aide:?"
 
-#: dselect/pkginfo.cc:85
+#: dselect/pkginfo.cc
 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 "
@@ -1662,80 +1691,110 @@ msgstr ""
 "vous permet de marquer des paquets appartenant à des groupes de types "
 "différents."
 
-#: dselect/pkginfo.cc:98
+#: dselect/pkginfo.cc
 msgid "Interrelationships"
 msgstr "Relations d'inter-dépendances"
 
-#: dselect/pkginfo.cc:117
+#: dselect/pkginfo.cc
 msgid "No description available."
 msgstr "Aucune description disponible."
 
-#: dselect/pkginfo.cc:135
+#: dselect/pkginfo.cc
 msgid "Installed control file information"
 msgstr "information de contrôle installée"
 
-#: dselect/pkginfo.cc:151
+#: dselect/pkginfo.cc
 msgid "Available control file information"
 msgstr "Informations disponibles du fichier de contrôle"
 
-#: dselect/pkglist.cc:425
+#: dselect/pkglist.cc
 msgid "there are no packages"
 msgstr "Il n'existe pas de paquets"
 
-#: dselect/pkglist.cc:521
+#: dselect/pkglist.cc
 msgid "invalid search option given"
 msgstr "Option de recherche donnée invalide"
 
-#: dselect/pkglist.cc:536
+#: dselect/pkglist.cc
 msgid "error in regular expression"
 msgstr "Erreur dans l'expression rationnelle"
 
-#: dselect/pkgsublist.cc:111
+#: dselect/pkgsublist.cc
 msgid " does not appear to be available\n"
 msgstr " semble ne pas être disponible\n"
 
-#: dselect/pkgsublist.cc:131
+#: dselect/pkgsublist.cc
 msgid " or "
 msgstr " ou "
 
-#: dselect/pkgtop.cc:58
+#: dselect/pkgtop.cc
 msgid "All"
 msgstr "Tous"
 
-#: dselect/pkgtop.cc:80
+#: dselect/pkgtop.cc
 msgid "All packages"
 msgstr "Tous les paquets"
 
-#: dselect/pkgtop.cc:84
+#: dselect/pkgtop.cc
 #, c-format
 msgid "%s packages without a section"
 msgstr "Paquets %s sans section"
 
-#: dselect/pkgtop.cc:86
+#: dselect/pkgtop.cc
 #, c-format
 msgid "%s packages in section %s"
 msgstr "Paquets %s dans la section %s"
 
-#: dselect/pkgtop.cc:92
+#: dselect/pkgtop.cc
 #, c-format
 msgid "%s %s packages"
 msgstr "Paquets %s %s"
 
-#: dselect/pkgtop.cc:96
+#: dselect/pkgtop.cc
 #, c-format
 msgid "%s %s packages without a section"
 msgstr "Paquets %s %s sans section"
 
-#: dselect/pkgtop.cc:98
+#: dselect/pkgtop.cc
 #, c-format
 msgid "%s %s packages in section %s"
 msgstr "Paquets %s %s dans la section %s"
 
-#: dselect/pkgtop.cc:119
+#: dselect/pkgtop.cc
 #, c-format
 msgid "%-*s %s%s%s;  %s (was: %s).  %s"
 msgstr "%-*s %s%s%s ;  %s (précédemment : %s).  %s"
 
+#~ msgid "Actions:\n"
+#~ msgstr "Actions :\n"
+
+#~ msgid "Colours:\n"
+#~ msgstr "Couleurs :\n"
+
+#~ msgid "Attributes:\n"
+#~ msgstr "Attributs :\n"
+
+#~ msgid "EOF before option name start"
+#~ msgstr "EOF précédant le début du nom de l'option"
+
+#~ msgid "EOF before summary"
+#~ msgstr "EOF précédant le résumé"
+
+#~ msgid "!Bug!"
+#~ msgstr "!Bogue!"
+
+#~ msgid "Updated"
+#~ msgstr "mis à jour"
+
+#~ msgid "Up-to-date"
+#~ msgstr "à jour"
+
+#~ msgid "Updated packages (newer version is available)"
+#~ msgstr "Paquets mis à jour (une version plus récente est disponible)"
+
+#~ msgid "Available packages (not currently installed)"
+#~ msgstr "Paquets disponibles (pas installés pour l'instant)"
+
 #~ msgid "foreign architectures enabled but multi-arch is not supported"
 #~ msgstr ""
 #~ "les architectures étrangères sont activées mais les fonctionnalités multi-"
diff --git a/dselect/po/gl.po b/dselect/po/gl.po
index ff2d013d3..f61a896b5 100644
--- a/dselect/po/gl.po
+++ b/dselect/po/gl.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dselect 1.17.0\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2014-12-23 18:12+0100\n"
+"POT-Creation-Date: 2015-04-06 09:37+0200\n"
 "PO-Revision-Date: 2008-12-27 15:56+0100\n"
 "Last-Translator: mvillarino <mvillarino@users.sourceforge.net>\n"
 "Language-Team: Galician <proxecto@trasno.net>\n"
@@ -20,28 +20,28 @@ msgstr ""
 "X-Generator: KBabel 1.11.4\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 
-#: dselect/basecmds.cc:125
+#: dselect/basecmds.cc
 msgid "Search for ? "
 msgstr "Buscar ? "
 
-#: dselect/basecmds.cc:149
+#: dselect/basecmds.cc
 msgid "Error: "
 msgstr "Erro: "
 
-#: dselect/basecmds.cc:180
+#: dselect/basecmds.cc
 msgid "Help: "
 msgstr "Axuda: "
 
-#: dselect/basecmds.cc:186
+#: dselect/basecmds.cc
 msgid "Press ? for help menu, . for next topic, <space> to exit help."
 msgstr ""
 "Prema ? para o menú de axuda, . para o seguinte tema, <espazo> para saír."
 
-#: dselect/basecmds.cc:193
+#: dselect/basecmds.cc
 msgid "Help information is available under the following topics:"
 msgstr "Hai información de axuda dispoñíbel para os seguintes temas:"
 
-#: dselect/basecmds.cc:201
+#: dselect/basecmds.cc
 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. "
@@ -49,241 +49,241 @@ msgstr ""
 "Prema nunha tecla da lista de riba, <espazo> ou \"q\" para saír da axuda,\n"
 "  ou \".\" (punto) para ler as páxinas de axuda unha por unha. "
 
-#: dselect/basecmds.cc:207
+#: dselect/basecmds.cc
 msgid "error reading keyboard in help"
 msgstr "erro ao ler o teclado na axuda"
 
-#: dselect/baselist.cc:60
+#: dselect/baselist.cc
 msgid "ioctl(TIOCGWINSZ) failed"
 msgstr "ioctl(TIOCGWINSZ) fallou"
 
-#: dselect/baselist.cc:63
+#: dselect/baselist.cc
 msgid "doupdate in SIGWINCH handler failed"
 msgstr "a chamada a doupdate no manexador de SIGWINCH fallou"
 
-#: dselect/baselist.cc:72
+#: dselect/baselist.cc
 msgid "failed to restore old SIGWINCH sigact"
 msgstr "non foi posíbel recuperar o antigo manexador de SIGWINCH"
 
-#: dselect/baselist.cc:75
+#: dselect/baselist.cc
 msgid "failed to restore old signal mask"
 msgstr "non foi posíbel recuperar a antiga máscara de sinais"
 
-#: dselect/baselist.cc:86
+#: dselect/baselist.cc
 msgid "failed to get old signal mask"
 msgstr "non foi posíbel obter a antiga máscara de sinais"
 
-#: dselect/baselist.cc:88
+#: dselect/baselist.cc
 msgid "failed to get old SIGWINCH sigact"
 msgstr "non foi posíbel obter o antigo manexador de SIGWINCH"
 
-#: dselect/baselist.cc:93
+#: dselect/baselist.cc
 msgid "failed to block SIGWINCH"
 msgstr "non foi posíbel bloquear SIGWINCH"
 
-#: dselect/baselist.cc:99
+#: dselect/baselist.cc
 msgid "failed to set new SIGWINCH sigact"
 msgstr "non foi posíbel estabelecer o novo manexador de SIGWINCH"
 
-#: dselect/baselist.cc:174
+#: dselect/baselist.cc
 msgid "failed to allocate colour pair"
 msgstr "non foi posíbel reservar un par de cores"
 
-#: dselect/baselist.cc:203
+#: dselect/baselist.cc
 msgid "failed to create title window"
 msgstr "non foi posíbel crear a fiestra de título"
 
-#: dselect/baselist.cc:207
+#: dselect/baselist.cc
 msgid "failed to create whatinfo window"
 msgstr "non foi posíbel crear a fiestra de whatinfo"
 
-#: dselect/baselist.cc:211
+#: dselect/baselist.cc
 msgid "failed to create baselist pad"
 msgstr "non foi posíbel crear o panel de baselist"
 
-#: dselect/baselist.cc:214
+#: dselect/baselist.cc
 msgid "failed to create heading pad"
 msgstr "non foi posíbel crear o panel de cabeceiras"
 
-#: dselect/baselist.cc:218
+#: dselect/baselist.cc
 msgid "failed to create thisstate pad"
 msgstr "non foi posíbel crear o panel de estado"
 
-#: dselect/baselist.cc:222
+#: dselect/baselist.cc
 msgid "failed to create info pad"
 msgstr "non foi posíbel crear o panel de información"
 
-#: dselect/baselist.cc:227
+#: dselect/baselist.cc
 msgid "failed to create query window"
 msgstr "non foi posíbel crear a fiestra de consultas"
 
-#: dselect/baselist.cc:298
+#: dselect/baselist.cc
 msgid "Keybindings"
 msgstr "Asignacións de teclas"
 
-#: dselect/baselist.cc:347
+#: dselect/baselist.cc
 #, c-format
 msgid "  -- %d%%, press "
 msgstr "  -- %d%%, prema "
 
-#: dselect/baselist.cc:350
+#: dselect/baselist.cc
 #, c-format
 msgid "%s for more"
 msgstr "%s para máis"
 
-#: dselect/baselist.cc:354
+#: dselect/baselist.cc
 #, c-format
 msgid "%s to go back"
 msgstr "%s para voltar"
 
-#: dselect/bindings.cc:78
+#: dselect/bindings.cc
 msgid "[not bound]"
 msgstr "[sen asignar]"
 
-#: dselect/bindings.cc:82
+#: dselect/bindings.cc
 #, c-format
 msgid "[unk: %d]"
 msgstr "[desc: %d]"
 
-#: dselect/bindings.cc:141
+#: dselect/bindings.cc
 msgid "Scroll onwards through help/information"
 msgstr "Avanzar pola axuda/información"
 
-#: dselect/bindings.cc:142
+#: dselect/bindings.cc
 msgid "Scroll backwards through help/information"
 msgstr "Retroceder pola axuda/información"
 
-#: dselect/bindings.cc:143
+#: dselect/bindings.cc
 msgid "Move up"
 msgstr "Subir"
 
-#: dselect/bindings.cc:144
+#: dselect/bindings.cc
 msgid "Move down"
 msgstr "Baixar"
 
-#: dselect/bindings.cc:145
+#: dselect/bindings.cc
 msgid "Go to top of list"
 msgstr "Ir ao cumio da lista"
 
-#: dselect/bindings.cc:146
+#: dselect/bindings.cc
 msgid "Go to end of list"
 msgstr "Ir ao final da lista"
 
-#: dselect/bindings.cc:147
+#: dselect/bindings.cc
 msgid "Request help (cycle through help screens)"
 msgstr "Solicitar axuda (pasar polas pantallas de axuda)"
 
-#: dselect/bindings.cc:148
+#: dselect/bindings.cc
 msgid "Cycle through information displays"
 msgstr "Pasar polas pantallas de información"
 
-#: dselect/bindings.cc:149
+#: dselect/bindings.cc
 msgid "Redraw display"
 msgstr "Debuxar de novo a pantalla"
 
-#: dselect/bindings.cc:150
+#: dselect/bindings.cc
 msgid "Scroll onwards through list by 1 line"
 msgstr "Avanzar 1 liña na lista"
 
-#: dselect/bindings.cc:151
+#: dselect/bindings.cc
 msgid "Scroll backwards through list by 1 line"
 msgstr "Retroceder 1 liña na lista"
 
-#: dselect/bindings.cc:152
+#: dselect/bindings.cc
 msgid "Scroll onwards through help/information by 1 line"
 msgstr "Avanzar 1 liña na axuda/información"
 
-#: dselect/bindings.cc:153
+#: dselect/bindings.cc
 msgid "Scroll backwards through help/information by 1 line"
 msgstr "Retroceder 1 liña na axuda/información"
 
-#: dselect/bindings.cc:154
+#: dselect/bindings.cc
 msgid "Scroll onwards through list"
 msgstr "Avanzar pola lista"
 
-#: dselect/bindings.cc:155
+#: dselect/bindings.cc
 msgid "Scroll backwards through list"
 msgstr "Retroceder pola lista"
 
-#: dselect/bindings.cc:158
+#: dselect/bindings.cc
 msgid "Mark package(s) for installation"
 msgstr "Marcar o(s) paquete(s) para o(s) instalar"
 
-#: dselect/bindings.cc:159
+#: dselect/bindings.cc
 msgid "Mark package(s) for deinstallation"
 msgstr "Marcar o(s) paquete(s) para o(s) desinstalar"
 
-#: dselect/bindings.cc:160
+#: dselect/bindings.cc
 msgid "Mark package(s) for deinstall and purge"
 msgstr "Marcar o(s) paquete(s) para o(s) desintalar e purgar"
 
-#: dselect/bindings.cc:161
+#: dselect/bindings.cc
 msgid "Make highlight more specific"
 msgstr "Facer o realzado máis específico"
 
-#: dselect/bindings.cc:162
+#: dselect/bindings.cc
 msgid "Make highlight less specific"
 msgstr "Facer o realzado menos específico"
 
-#: dselect/bindings.cc:163
+#: dselect/bindings.cc
 msgid "Search for a package whose name contains a string"
 msgstr "Procurar un paquete cun nome que contén unha cadea"
 
-#: dselect/bindings.cc:164
+#: dselect/bindings.cc
 #, fuzzy
 #| msgid "Repeat last search."
 msgid "Repeat last search"
 msgstr "Repetir a última procura."
 
-#: dselect/bindings.cc:165
+#: dselect/bindings.cc
 msgid "Swap sort order priority/section"
 msgstr "Trocar a orde de prioridade/sección"
 
-#: dselect/bindings.cc:166
+#: dselect/bindings.cc
 msgid "Quit, confirming, and checking dependencies"
 msgstr "Saír, confirmando e comprobando as dependencias"
 
-#: dselect/bindings.cc:167
+#: dselect/bindings.cc
 msgid "Quit, confirming without check"
 msgstr "Saír, confirmando sen comprobar"
 
-#: dselect/bindings.cc:168
+#: dselect/bindings.cc
 msgid "Quit, rejecting conflict/dependency suggestions"
 msgstr "Saír, rexeitando as suxestións de conflitos/dependencias"
 
-#: dselect/bindings.cc:169
+#: dselect/bindings.cc
 msgid "Abort - quit without making changes"
 msgstr "Abortar - saír sen facer cambio ningún"
 
-#: dselect/bindings.cc:170
+#: dselect/bindings.cc
 msgid "Revert to old state for all packages"
 msgstr "Voltar todos os paquetes ao estado antigo"
 
-#: dselect/bindings.cc:171
+#: dselect/bindings.cc
 msgid "Revert to suggested state for all packages"
 msgstr "Voltar todos os paquetes ao estado suxerido"
 
-#: dselect/bindings.cc:172
+#: dselect/bindings.cc
 msgid "Revert to directly requested state for all packages"
 msgstr "Voltar todos os paquetes ao estado solicitado directamente"
 
-#: dselect/bindings.cc:173
+#: dselect/bindings.cc
 msgid "Revert to currently installed state for all packages"
 msgstr "Voltar todos os paquetes ao estado co que están instalados"
 
-#: dselect/bindings.cc:176
+#: dselect/bindings.cc
 msgid "Select currently-highlighted access method"
 msgstr "Escoller o método de acceso realzado"
 
-#: dselect/bindings.cc:177
+#: dselect/bindings.cc
 msgid "Quit without changing selected access method"
 msgstr "Saír sen trocar o método de acceso escollido"
 
-#: dselect/helpmsgs.cc:29
+#: dselect/helpmsgs.cc
 msgid "Keystrokes"
 msgstr "Teclas"
 
-#: dselect/helpmsgs.cc:29
+#: dselect/helpmsgs.cc
 #, fuzzy
 #| msgid ""
 #| "Motion keys: Next/Previous, Top/End, Up/Down, Backwards/Forwards:\n"
@@ -378,11 +378,11 @@ msgstr ""
 "   D     Establece o estado solicitado        n, \\\\  repetir a última "
 "procura\n"
 
-#: dselect/helpmsgs.cc:55
+#: dselect/helpmsgs.cc
 msgid "Introduction to package selections"
 msgstr "Introdución ás escollas de paquetes"
 
-#: dselect/helpmsgs.cc:55
+#: dselect/helpmsgs.cc
 msgid ""
 "Welcome to dselect's main package listing.\n"
 "\n"
@@ -440,11 +440,11 @@ msgstr ""
 "\n"
 "Prema <Espazo> para saír da axuda e entrar agora na lista.\n"
 
-#: dselect/helpmsgs.cc:80
+#: dselect/helpmsgs.cc
 msgid "Introduction to read-only package list browser"
 msgstr "Introdución ao navegador da lista de paquetes de só lectura"
 
-#: dselect/helpmsgs.cc:80
+#: dselect/helpmsgs.cc
 msgid ""
 "Welcome to dselect's main package listing.\n"
 "\n"
@@ -485,11 +485,11 @@ msgstr ""
 "\n"
 "Prema <Espazo> para saír da axuda e entrar agora na lista.\n"
 
-#: dselect/helpmsgs.cc:99
+#: dselect/helpmsgs.cc
 msgid "Introduction to conflict/dependency resolution sub-list"
 msgstr "Introdución á sublista de resolución de conflitos/dependencias"
 
-#: dselect/helpmsgs.cc:99
+#: dselect/helpmsgs.cc
 msgid ""
 "Dependency/conflict resolution - introduction.\n"
 "\n"
@@ -553,11 +553,11 @@ msgstr ""
 "Prema <Espazo> para saír da axuda e entrar na sub-lista; prema \"?\" para "
 "axuda.\n"
 
-#: dselect/helpmsgs.cc:125
+#: dselect/helpmsgs.cc
 msgid "Display, part 1: package listing and status chars"
 msgstr "Pantalla, parte 1: listado de paquetes e caracteres de estado"
 
-#: dselect/helpmsgs.cc:125
+#: dselect/helpmsgs.cc
 msgid ""
 "The top half of the screen shows a list of packages.  For each package you "
 "see\n"
@@ -619,11 +619,11 @@ msgstr ""
 "instalada e dispoñíbel (maiúsc-V para mostrar/agochar) e descrición "
 "resumida.\n"
 
-#: dselect/helpmsgs.cc:152
+#: dselect/helpmsgs.cc
 msgid "Display, part 2: list highlight; information display"
 msgstr "Pantalla, parte 2: resaltado de listas; pantalla de información"
 
-#: dselect/helpmsgs.cc:152
+#: dselect/helpmsgs.cc
 msgid ""
 "* Highlight: One line in the package list will be highlighted.  It "
 "indicates\n"
@@ -676,11 +676,11 @@ msgstr ""
 "pantalla\n"
 "  de información ou para a expandir para que empregue case toda a pantalla.\n"
 
-#: dselect/helpmsgs.cc:176
+#: dselect/helpmsgs.cc
 msgid "Introduction to method selection display"
 msgstr "Introdución á pantalla de selección de métodos"
 
-#: dselect/helpmsgs.cc:176
+#: dselect/helpmsgs.cc
 msgid ""
 "dselect and dpkg can do automatic installation, loading the package files to "
 "be\n"
@@ -722,11 +722,11 @@ msgstr ""
 "agora,\n"
 "ou no menú de axuda que se pode ver premendo \"?\".\n"
 
-#: dselect/helpmsgs.cc:196
+#: dselect/helpmsgs.cc
 msgid "Keystrokes for method selection"
 msgstr "Teclas para a escolla de métodos"
 
-#: dselect/helpmsgs.cc:196
+#: dselect/helpmsgs.cc
 msgid ""
 "Motion keys: Next/Previous, Top/End, Up/Down, Backwards/Forwards:\n"
 "  j, Down-arrow         k, Up-arrow             move highlight\n"
@@ -775,104 +775,104 @@ msgstr ""
 "  /               procurar (prema só Intro para cancelar)\n"
 "  \\               repetir a última procura\n"
 
-#: dselect/main.cc:63
+#: dselect/main.cc
 msgid "Type dselect --help for help."
 msgstr "Escriba dselect --help para obter axuda."
 
-#: dselect/main.cc:145
+#: dselect/main.cc
 msgid "a"
 msgstr "a"
 
-#: dselect/main.cc:145
+#: dselect/main.cc
 msgid "[A]ccess"
 msgstr "[A]cceso"
 
-#: dselect/main.cc:145
+#: dselect/main.cc
 msgid "Choose the access method to use."
 msgstr "Escolle o método de acceso a empregar."
 
-#: dselect/main.cc:146
+#: dselect/main.cc
 msgid "u"
 msgstr "u"
 
-#: dselect/main.cc:146
+#: dselect/main.cc
 msgid "[U]pdate"
 msgstr "Act[U]alizar"
 
-#: dselect/main.cc:146
+#: dselect/main.cc
 msgid "Update list of available packages, if possible."
 msgstr "Actualiza a lista de paquetes dispoñíbeis, se é posíbel."
 
-#: dselect/main.cc:147
+#: dselect/main.cc
 msgid "s"
 msgstr "s"
 
-#: dselect/main.cc:147
+#: dselect/main.cc
 msgid "[S]elect"
 msgstr "E[S]coller"
 
-#: dselect/main.cc:147
+#: dselect/main.cc
 msgid "Request which packages you want on your system."
 msgstr "Escolle os paquetes que se queren no sistema."
 
-#: dselect/main.cc:148
+#: dselect/main.cc
 msgid "i"
 msgstr "i"
 
-#: dselect/main.cc:148
+#: dselect/main.cc
 msgid "[I]nstall"
 msgstr "[I]nstalar"
 
-#: dselect/main.cc:148
+#: dselect/main.cc
 msgid "Install and upgrade wanted packages."
 msgstr "Instala e actualiza os paquetes solicitados."
 
-#: dselect/main.cc:149
+#: dselect/main.cc
 msgid "c"
 msgstr "c"
 
-#: dselect/main.cc:149
+#: dselect/main.cc
 msgid "[C]onfig"
 msgstr "[C]onfigurar"
 
-#: dselect/main.cc:149
+#: dselect/main.cc
 msgid "Configure any packages that are unconfigured."
 msgstr "Configura os paquetes que non estean configurados."
 
-#: dselect/main.cc:150
+#: dselect/main.cc
 msgid "r"
 msgstr "e"
 
-#: dselect/main.cc:150
+#: dselect/main.cc
 msgid "[R]emove"
 msgstr "[E]liminar"
 
-#: dselect/main.cc:150
+#: dselect/main.cc
 msgid "Remove unwanted software."
 msgstr "Elimina o software non desexado."
 
-#: dselect/main.cc:151
+#: dselect/main.cc
 msgid "q"
 msgstr "s"
 
-#: dselect/main.cc:151
+#: dselect/main.cc
 msgid "[Q]uit"
 msgstr "[S]aír"
 
-#: dselect/main.cc:151
+#: dselect/main.cc
 msgid "Quit dselect."
 msgstr "Sae de dselect."
 
-#: dselect/main.cc:152
+#: dselect/main.cc
 msgid "menu"
 msgstr "menú"
 
-#: dselect/main.cc:157
+#: dselect/main.cc
 #, c-format
 msgid "Debian `%s' package handling frontend version %s.\n"
 msgstr "Interface de xestión de paquetes \"%s\" de Debian versión %s.\n"
 
-#: dselect/main.cc:160
+#: dselect/main.cc
 #, fuzzy
 msgid ""
 "This is free software; see the GNU General Public License version 2 or\n"
@@ -883,20 +883,28 @@ msgstr ""
 "2 ou unha posterior para coñecer as condicións de copia. NON hai garantía.\n"
 "Consulte %s --license para os detalles de copyright e licenza.\n"
 
-#: dselect/main.cc:169 dselect/main.cc:217
+#: dselect/main.cc
 msgid "<standard output>"
 msgstr ""
 
-#: dselect/main.cc:180
-#, c-format
+#: dselect/main.cc
+#, fuzzy, c-format
+#| msgid ""
+#| "Usage: %s [<option> ...] [<action> ...]\n"
+#| "\n"
 msgid ""
-"Usage: %s [<option> ...] [<action> ...]\n"
+"Usage: %s [<option>...] [<command>...]\n"
 "\n"
 msgstr ""
 "Emprego: %s [<opción> ...] [<acción> ...]\n"
 "\n"
 
-#: dselect/main.cc:184
+#: dselect/main.cc
+#, c-format
+msgid "Commands:\n"
+msgstr ""
+
+#: dselect/main.cc
 #, fuzzy, c-format
 #| msgid ""
 #| "Options:\n"
@@ -910,12 +918,12 @@ msgstr ""
 #| "\n"
 msgid ""
 "Options:\n"
-"  --admindir <directory>     Use <directory> instead of %s.\n"
-"  --expert                   Turn on expert mode.\n"
-"  --debug <file> | -D<file>  Turn on debugging, sending output to <file>.\n"
-"  --colour | --color screenpart:[foreground],[background][:attr[+attr+...]]\n"
-"                             Configure screen colours.\n"
-"\n"
+"      --admindir <directory>       Use <directory> instead of %s.\n"
+"      --expert                     Turn on expert mode.\n"
+"  -D, --debug <file>               Turn on debugging, send output to "
+"<file>.\n"
+"      --color <color-spec>         Configure screen colors.\n"
+"      --colour <color-spec>        Ditto.\n"
 msgstr ""
 "Opcións:\n"
 "  --admindir <directorio>    Emprega o <directorio> no canto de %s.\n"
@@ -926,11 +934,11 @@ msgstr ""
 "                             Configura as cores da pantalla.\n"
 "\n"
 
-#: dselect/main.cc:193
+#: dselect/main.cc
 #, fuzzy, c-format
 msgid ""
-"  --help                     Show this help message.\n"
-"  --version                  Show the version.\n"
+"  -?, --help                       Show this help message.\n"
+"      --version                    Show the version.\n"
 "\n"
 msgstr ""
 "  --help                     Mostra esta mensaxe de axuda.\n"
@@ -938,65 +946,67 @@ msgstr ""
 "  --license                  Mostra a licenza.\n"
 "\n"
 
-#: dselect/main.cc:197
-#, fuzzy, c-format
-#| msgid "Section"
-msgid "Actions:\n"
-msgstr "Sección"
-
-#: dselect/main.cc:202
+#: dselect/main.cc
 #, c-format
-msgid "Screenparts:\n"
+msgid ""
+"<color-spec> is <screen-part>:[<foreground>],[<background>][:"
+"<attr>[+<attr>]...]\n"
+msgstr ""
+
+#: dselect/main.cc
+#, fuzzy, c-format
+#| msgid "Screenparts:\n"
+msgid "<screen-part> is:"
 msgstr "Partes da pantalla:\n"
 
-#: dselect/main.cc:207
+#: dselect/main.cc
 #, c-format
-msgid "Colours:\n"
-msgstr "Cores:\n"
+msgid "<color> is:"
+msgstr ""
 
-#: dselect/main.cc:212
+#: dselect/main.cc
 #, c-format
-msgid "Attributes:\n"
-msgstr "Atributos:\n"
+msgid "<attr> is:"
+msgstr ""
 
-#: dselect/main.cc:232
+#: dselect/main.cc
 #, c-format
 msgid "couldn't open debug file `%.255s'\n"
 msgstr "non foi posíbel abrir o ficheiro de depuración \"%.255s\"\n"
 
-#: dselect/main.cc:253
+#: dselect/main.cc
 #, fuzzy, c-format
 #| msgid "Invalid %s `%s'\n"
 msgid "invalid %s '%s'"
 msgstr "%s \"%s\" non válido\n"
 
-#: dselect/main.cc:272
+#: dselect/main.cc
 msgid "screen part"
 msgstr "parte da pantalla"
 
-#: dselect/main.cc:278
+#: dselect/main.cc
 #, fuzzy
 #| msgid "Null colour specification\n"
 msgid "null colour specification"
 msgstr "Especificación de cores nula\n"
 
-#: dselect/main.cc:286 dselect/main.cc:291
+#: dselect/main.cc
 msgid "colour"
 msgstr "cor"
 
-#: dselect/main.cc:299
+#: dselect/main.cc
 msgid "colour attribute"
 msgstr "atributo de cores"
 
-#: dselect/main.cc:333
+#: dselect/main.cc
 msgid "Terminal does not appear to support cursor addressing.\n"
 msgstr "Semella que o terminal non soporta localización do cursor.\n"
 
-#: dselect/main.cc:335
+#: dselect/main.cc
 msgid "Terminal does not appear to support highlighting.\n"
 msgstr "Semella que o terminal non soporta realzado.\n"
 
-#: dselect/main.cc:337
+#: dselect/main.cc
 #, c-format
 msgid ""
 "Set your TERM variable correctly, use a better terminal,\n"
@@ -1005,11 +1015,11 @@ msgstr ""
 "Estabeleza correctamente a variábel TERM, empregue un terminal mellor\n"
 "ou empregue a ferramenta de xestión paquete a paquete %s.\n"
 
-#: dselect/main.cc:340
+#: dselect/main.cc
 msgid "terminal lacks necessary features, giving up"
 msgstr "o terminal non ten características necesarias; sáese"
 
-#: dselect/main.cc:425
+#: dselect/main.cc
 msgid ""
 "\n"
 "\n"
@@ -1022,7 +1032,7 @@ msgstr ""
 "Móvase con ^P e ^N, as frechas do cursor, letras iniciais ou números;\n"
 "Prema <intro> para confirmar a escolla. ^L volve debuxar a pantalla.\n"
 
-#: dselect/main.cc:430
+#: dselect/main.cc
 msgid ""
 "Copyright (C) 1994-1996 Ian Jackson.\n"
 "Copyright (C) 2000,2001 Wichert Akkerman.\n"
@@ -1030,7 +1040,7 @@ msgstr ""
 "Copyright (C) 1994-1996 Ian Jackson.\n"
 "Copyright (C) 2000,2001 Wichert Akkerman.\n"
 
-#: dselect/main.cc:436
+#: dselect/main.cc
 msgid ""
 "\n"
 "\n"
@@ -1040,57 +1050,57 @@ msgstr ""
 "\n"
 "Acceso de só lectura: só está dispoñíbel a antevisión das escollas."
 
-#: dselect/main.cc:455
+#: dselect/main.cc
 msgid "failed to getch in main menu"
 msgstr "non foi posíbel chamar a getch no menú principal"
 
-#: dselect/main.cc:538
+#: dselect/main.cc
 #, c-format
 msgid "unknown action string `%.50s'"
 msgstr "cadea de acción \"%.50s\" descoñecida"
 
-#: dselect/methlist.cc:66
+#: dselect/methlist.cc
 msgid "Abbrev."
 msgstr "Abrev."
 
-#: dselect/methlist.cc:67 dselect/pkgdisplay.cc:188 dselect/pkginfo.cc:110
+#: dselect/methlist.cc dselect/pkgdisplay.cc dselect/pkginfo.cc
 msgid "Description"
 msgstr "Descrición"
 
-#: dselect/methlist.cc:73
+#: dselect/methlist.cc
 msgid "dselect - list of access methods"
 msgstr "dselect - lista de métodos de acceso"
 
-#: dselect/methlist.cc:82
+#: dselect/methlist.cc
 #, c-format
 msgid "Access method `%s'."
 msgstr "Método de acceso \"%s\"."
 
-#: dselect/methlist.cc:161 dselect/pkglist.cc:587
+#: dselect/methlist.cc dselect/pkglist.cc
 msgid "doupdate failed"
 msgstr "a chamada a doupdate fallou"
 
-#: dselect/methlist.cc:164 dselect/pkglist.cc:590
+#: dselect/methlist.cc dselect/pkglist.cc
 msgid "failed to unblock SIGWINCH"
 msgstr "non foi posíbel desbloquear SIGWINCH"
 
-#: dselect/methlist.cc:169 dselect/pkglist.cc:595
+#: dselect/methlist.cc dselect/pkglist.cc
 msgid "failed to re-block SIGWINCH"
 msgstr "non foi posíbel volver bloquear SIGWINCH"
 
-#: dselect/methlist.cc:170 dselect/pkglist.cc:597
+#: dselect/methlist.cc dselect/pkglist.cc
 msgid "getch failed"
 msgstr "a chamada a getch fallou"
 
-#: dselect/methlist.cc:187
+#: dselect/methlist.cc
 msgid "Explanation"
 msgstr "Explicación"
 
-#: dselect/methlist.cc:197
+#: dselect/methlist.cc
 msgid "No explanation available."
 msgstr "Non hai nengunha explicación dispoñíbel."
 
-#: dselect/method.cc:67
+#: dselect/method.cc
 #, c-format
 msgid ""
 "\n"
@@ -1101,7 +1111,7 @@ msgstr ""
 "\n"
 "%s: %s\n"
 
-#: dselect/method.cc:70
+#: dselect/method.cc
 msgid ""
 "\n"
 "Press <enter> to continue."
@@ -1109,193 +1119,203 @@ msgstr ""
 "\n"
 "Prema <intro> para continuar."
 
-#: dselect/method.cc:82
+#: dselect/method.cc
 msgid "cannot unlock access method area"
 msgstr ""
 
-#: dselect/method.cc:96
+#: dselect/method.cc
 #, fuzzy
 #| msgid " does not appear to be available\n"
 msgid "no access methods are available"
 msgstr " non semella que estea dispoñíbel\n"
 
-#: dselect/method.cc:115
+#: dselect/method.cc
 msgid "requested operation requires superuser privilege"
 msgstr ""
 
-#: dselect/method.cc:118
+#: dselect/method.cc
 #, fuzzy
 #| msgid "Choose the access method to use."
 msgid "cannot open or create access method lockfile"
 msgstr "Escolle o método de acceso a empregar."
 
-#: dselect/method.cc:125
+#: dselect/method.cc
 msgid "the access method area is already locked"
 msgstr ""
 
-#: dselect/method.cc:128
+#: dselect/method.cc
 #, fuzzy
 #| msgid "dselect - list of access methods"
 msgid "cannot lock access method area"
 msgstr "dselect - lista de métodos de acceso"
 
-#: dselect/method.cc:161
+#: dselect/method.cc
 #, c-format
 msgid "Press <enter> to continue.\n"
 msgstr "Prema <intro> para continuar.\n"
 
-#: dselect/method.cc:162
+#: dselect/method.cc
 #, fuzzy
 msgid "<standard error>"
 msgstr "erro de escritura no erro estándar"
 
-#: dselect/method.cc:165
+#: dselect/method.cc
 msgid "error reading acknowledgement of program failure message"
 msgstr ""
 "erro ao ler o xustificante de recepción da mensaxe de fallo do programa"
 
-#: dselect/method.cc:187
+#: dselect/method.cc
 msgid "no access method is selected or configured"
 msgstr ""
 
-#: dselect/method.cc:196
+#: dselect/method.cc
 msgid "update available list script"
 msgstr "script de actualización da lista de dispoñíbeis"
 
-#: dselect/method.cc:200
+#: dselect/method.cc
 msgid "installation script"
 msgstr "script de instalación"
 
-#: dselect/method.cc:246
+#: dselect/method.cc
 msgid "query/setup script"
 msgstr "script de consulta/configuración"
 
-#: dselect/methparse.cc:53
+#: dselect/methparse.cc
 #, c-format
 msgid "syntax error in method options file `%.250s' -- %s"
 msgstr "erro de sintaxe no ficheiro de opcións do método \"%.250s\" -- %s"
 
-#: dselect/methparse.cc:59
+#: dselect/methparse.cc
 #, c-format
 msgid "error reading options file `%.250s'"
 msgstr "erro ao ler o ficheiro de opcións \"%.250s\""
 
-#: dselect/methparse.cc:93
+#: dselect/methparse.cc
 #, c-format
 msgid "unable to read `%.250s' directory for reading methods"
 msgstr "non foi posíbel ler o directorio \"%.250s\" para ler os métodos"
 
-#: dselect/methparse.cc:109
+#: dselect/methparse.cc
 #, c-format
 msgid "method `%.250s' has name that is too long (%d > %d characters)"
 msgstr "o método \"%.250s\" ten un nome longo de máis (%d > %d caracteres)"
 
-#: dselect/methparse.cc:120
+#: dselect/methparse.cc
 #, c-format
 msgid "unable to access method script `%.250s'"
 msgstr "non foi posíbel acceder ao script de método \"%.250s\""
 
-#: dselect/methparse.cc:126
+#: dselect/methparse.cc
 #, c-format
 msgid "unable to read method options file `%.250s'"
 msgstr "non foi posíbel ler o ficheiro de opcións do método \"%.250s\""
 
-#: dselect/methparse.cc:150
+#: dselect/methparse.cc
 msgid "non-digit where digit wanted"
 msgstr "algo distinto dun díxito onde se esperaba un"
 
-#: dselect/methparse.cc:153
-msgid "EOF in index string"
+#: dselect/methparse.cc
+#, fuzzy
+#| msgid "EOF in index string"
+msgid "end of file in index string"
 msgstr "fin de ficheiro na cadea de índice"
 
-#: dselect/methparse.cc:156
+#: dselect/methparse.cc
 msgid "index string too long"
 msgstr "cadea de índice longa de máis"
 
-#: dselect/methparse.cc:159
+#: dselect/methparse.cc
 msgid "newline before option name start"
 msgstr "salto de liña antes do comezo do nome da opción"
 
-#: dselect/methparse.cc:161
-msgid "EOF before option name start"
-msgstr "fin de ficheiro antes do comezo do nome da opción"
+#: dselect/methparse.cc
+#, fuzzy
+#| msgid "newline before option name start"
+msgid "end of file before option name start"
+msgstr "salto de liña antes do comezo do nome da opción"
 
-#: dselect/methparse.cc:165
+#: dselect/methparse.cc
 msgid "nonalpha where option name start wanted"
 msgstr "carácter non alfanumérico onde se agardaba o comezo do nome da opción"
 
-#: dselect/methparse.cc:167
+#: dselect/methparse.cc
 msgid "non-alphanum in option name"
 msgstr "carácter non alfanumérico no nome da opción"
 
-#: dselect/methparse.cc:170
-msgid "EOF in option name"
+#: dselect/methparse.cc
+#, fuzzy
+#| msgid "EOF in option name"
+msgid "end of file in option name"
 msgstr "fin de ficheiro no nome da opción"
 
-#: dselect/methparse.cc:175
+#: dselect/methparse.cc
 msgid "newline before summary"
 msgstr "salto de liña antes do resumo"
 
-#: dselect/methparse.cc:177
-msgid "EOF before summary"
-msgstr "fin de ficheiro antes do resumo"
+#: dselect/methparse.cc
+#, fuzzy
+#| msgid "newline before summary"
+msgid "end of file before summary"
+msgstr "salto de liña antes do resumo"
 
-#: dselect/methparse.cc:183
-msgid "EOF in summary - missing newline"
+#: dselect/methparse.cc
+#, fuzzy
+#| msgid "EOF in summary - missing newline"
+msgid "end of file in summary - missing newline"
 msgstr "fin de ficheiro no resumo - falla un salto de liña"
 
-#: dselect/methparse.cc:193
+#: dselect/methparse.cc
 #, c-format
 msgid "unable to open option description file `%.250s'"
 msgstr "non foi posíbel abrir o ficheiro de descrición da opción \"%.250s\""
 
-#: dselect/methparse.cc:197
+#: dselect/methparse.cc
 #, c-format
 msgid "unable to stat option description file `%.250s'"
 msgstr "non se atopa o ficheiro de descrición da opción \"%.250s\""
 
-#: dselect/methparse.cc:201
+#: dselect/methparse.cc
 #, c-format
 msgid "failed to read option description file `%.250s'"
 msgstr "non foi posíbel ler o ficheiro de descrición da opción \"%.250s\""
 
-#: dselect/methparse.cc:204
+#: dselect/methparse.cc
 #, c-format
 msgid "error during read of option description file `%.250s'"
 msgstr "erro na lectura do ficheiro de descrición da opción \"%.255s\""
 
-#: dselect/methparse.cc:227
+#: dselect/methparse.cc
 #, c-format
 msgid "error during read of method options file `%.250s'"
 msgstr "erro na lectura do ficheiro de opcións do método \"%.250s\""
 
-#: dselect/methparse.cc:250
+#: dselect/methparse.cc
 #, c-format
 msgid "unable to open current option file `%.250s'"
 msgstr "non foi posíbel abrir o ficheiro de opcións actual \"%.250s\""
 
-#: dselect/methparse.cc:286
+#: dselect/methparse.cc
 #, c-format
 msgid "unable to write new option to `%.250s'"
 msgstr "non foi posíbel gardar a nova opción en \"%.250s\""
 
-#: dselect/pkgdisplay.cc:36
+#: dselect/pkgdisplay.cc
 msgid "new package"
 msgstr "novo paquete"
 
-#: dselect/pkgdisplay.cc:37
+#: dselect/pkgdisplay.cc
 msgid "install"
 msgstr "instalar"
 
-#: dselect/pkgdisplay.cc:38
+#: dselect/pkgdisplay.cc
 msgid "hold"
 msgstr "reter"
 
-#: dselect/pkgdisplay.cc:39
+#: dselect/pkgdisplay.cc
 msgid "remove"
 msgstr "eliminar"
 
-#: dselect/pkgdisplay.cc:40
+#: dselect/pkgdisplay.cc
 msgid "purge"
 msgstr "purgar"
 
@@ -1303,331 +1323,325 @@ msgstr "purgar"
 #. * the empty string to store information about the translation. DO NOT
 #. * CHANGE THAT IN A TRANSLATION! The code really relies on that being
 #. * a single space.
-#: dselect/pkgdisplay.cc:47
+#: dselect/pkgdisplay.cc
 msgid " "
 msgstr " "
 
-#: dselect/pkgdisplay.cc:48
+#: dselect/pkgdisplay.cc
 msgid "REINSTALL"
 msgstr "REINSTALAR"
 
-#: dselect/pkgdisplay.cc:51
+#: dselect/pkgdisplay.cc
 msgid "not installed"
 msgstr "sen instalar"
 
-#: dselect/pkgdisplay.cc:52
+#: dselect/pkgdisplay.cc
 msgid "removed (configs remain)"
 msgstr "eliminado (queda config)"
 
-#: dselect/pkgdisplay.cc:53
+#: dselect/pkgdisplay.cc
 msgid "half installed"
 msgstr "medio instalado"
 
-#: dselect/pkgdisplay.cc:54
+#: dselect/pkgdisplay.cc
 msgid "unpacked (not set up)"
 msgstr "desempaquetado (sen configurar)"
 
-#: dselect/pkgdisplay.cc:55
+#: dselect/pkgdisplay.cc
 msgid "half configured (config failed)"
 msgstr ""
 
-#: dselect/pkgdisplay.cc:56
+#: dselect/pkgdisplay.cc
 msgid "awaiting trigger processing"
 msgstr "a agardar que se procese o desencadeante"
 
-#: dselect/pkgdisplay.cc:57
+#: dselect/pkgdisplay.cc
 msgid "triggered"
 msgstr "desencadeado"
 
-#: dselect/pkgdisplay.cc:58
+#: dselect/pkgdisplay.cc
 msgid "installed"
 msgstr "instalado"
 
-#: dselect/pkgdisplay.cc:61
+#: dselect/pkgdisplay.cc
 msgid "Required"
 msgstr "Requerido"
 
-#: dselect/pkgdisplay.cc:62
+#: dselect/pkgdisplay.cc
 msgid "Important"
 msgstr "Importante"
 
-#: dselect/pkgdisplay.cc:63
+#: dselect/pkgdisplay.cc
 msgid "Standard"
 msgstr "Estándar"
 
-#: dselect/pkgdisplay.cc:64
+#: dselect/pkgdisplay.cc
 msgid "Optional"
 msgstr "Opcional"
 
-#: dselect/pkgdisplay.cc:65
+#: dselect/pkgdisplay.cc
 msgid "Extra"
 msgstr "Extra"
 
-#: dselect/pkgdisplay.cc:66
-msgid "!Bug!"
-msgstr "¡Bug!"
-
-#: dselect/pkgdisplay.cc:67
+#: dselect/pkgdisplay.cc
 msgid "Unclassified"
 msgstr "Sen clasificar"
 
-#: dselect/pkgdisplay.cc:70
+#: dselect/pkgdisplay.cc
 msgid "suggests"
 msgstr "suxire"
 
-#: dselect/pkgdisplay.cc:71
+#: dselect/pkgdisplay.cc
 msgid "recommends"
 msgstr "recomenda"
 
-#: dselect/pkgdisplay.cc:72
+#: dselect/pkgdisplay.cc
 msgid "depends on"
 msgstr "depende de"
 
-#: dselect/pkgdisplay.cc:73
+#: dselect/pkgdisplay.cc
 msgid "pre-depends on"
 msgstr "pre-depende de"
 
-#: dselect/pkgdisplay.cc:74
+#: dselect/pkgdisplay.cc
 msgid "breaks"
 msgstr "racha"
 
-#: dselect/pkgdisplay.cc:75
+#: dselect/pkgdisplay.cc
 msgid "conflicts with"
 msgstr "ten conflitos con"
 
-#: dselect/pkgdisplay.cc:76
+#: dselect/pkgdisplay.cc
 msgid "provides"
 msgstr "fornece"
 
-#: dselect/pkgdisplay.cc:77
+#: dselect/pkgdisplay.cc
 msgid "replaces"
 msgstr "substitúe a"
 
-#: dselect/pkgdisplay.cc:78
+#: dselect/pkgdisplay.cc
 msgid "enhances"
 msgstr "mellora"
 
-#: dselect/pkgdisplay.cc:81
+#: dselect/pkgdisplay.cc
 msgid "Req"
 msgstr "Req"
 
-#: dselect/pkgdisplay.cc:82
+#: dselect/pkgdisplay.cc
 msgid "Imp"
 msgstr "Imp"
 
-#: dselect/pkgdisplay.cc:83
+#: dselect/pkgdisplay.cc
 msgid "Std"
 msgstr "Est"
 
-#: dselect/pkgdisplay.cc:84
+#: dselect/pkgdisplay.cc
 msgid "Opt"
 msgstr "Opc"
 
-#: dselect/pkgdisplay.cc:85
+#: dselect/pkgdisplay.cc
 msgid "Xtr"
 msgstr "Xtr"
 
-#: dselect/pkgdisplay.cc:86
+#: dselect/pkgdisplay.cc
 msgid "bUG"
 msgstr "bUG"
 
-#: dselect/pkgdisplay.cc:87
+#: dselect/pkgdisplay.cc
 msgid "?"
 msgstr "?"
 
-#: dselect/pkgdisplay.cc:95 dselect/pkgdisplay.cc:115
+#: dselect/pkgdisplay.cc
 msgid "Broken"
 msgstr "Rotos"
 
-#: dselect/pkgdisplay.cc:96
+#: dselect/pkgdisplay.cc
 msgid "New"
 msgstr "Novos"
 
-#: dselect/pkgdisplay.cc:97
-msgid "Updated"
-msgstr "Actualizados"
+#: dselect/pkgdisplay.cc
+msgid "Upgradable"
+msgstr ""
 
-#: dselect/pkgdisplay.cc:98
+#: dselect/pkgdisplay.cc
 msgid "Obsolete/local"
 msgstr "Obsoletos/locais"
 
-#: dselect/pkgdisplay.cc:99
-msgid "Up-to-date"
-msgstr "Ao día"
+#: dselect/pkgdisplay.cc
+msgid "Installed"
+msgstr "Instalados"
 
-#: dselect/pkgdisplay.cc:100
+#: dselect/pkgdisplay.cc
 msgid "Available"
 msgstr "Dispoñíbeis"
 
-#: dselect/pkgdisplay.cc:101 dselect/pkgdisplay.cc:117
+#: dselect/pkgdisplay.cc
 msgid "Removed"
 msgstr "Eliminados"
 
-#: dselect/pkgdisplay.cc:102 dselect/pkgdisplay.cc:111
+#: dselect/pkgdisplay.cc
 msgid "Brokenly installed packages"
 msgstr "Paquetes instalados pero rotos"
 
-#: dselect/pkgdisplay.cc:103
+#: dselect/pkgdisplay.cc
 msgid "Newly available packages"
 msgstr "Paquetes dispoñíbeis novos"
 
-#: dselect/pkgdisplay.cc:104
-msgid "Updated packages (newer version is available)"
-msgstr "Paquetes actualizados (hai unha nova versión dispoñíbel)"
+#: dselect/pkgdisplay.cc
+#, fuzzy
+#| msgid "Newly available packages"
+msgid "Upgradable packages"
+msgstr "Paquetes dispoñíbeis novos"
 
-#: dselect/pkgdisplay.cc:105
-msgid "Obsolete and local packages present on system"
+#: dselect/pkgdisplay.cc
+#, fuzzy
+#| msgid "Obsolete and local packages present on system"
+msgid "Obsolete and locally created packages"
 msgstr "Paquetes obsoletos e locais presentes no sistema"
 
-#: dselect/pkgdisplay.cc:106
-msgid "Up to date installed packages"
-msgstr "Paquetes instalados e ao día"
+#: dselect/pkgdisplay.cc
+msgid "Installed packages"
+msgstr "Paquetes instalados"
 
-#: dselect/pkgdisplay.cc:107
-msgid "Available packages (not currently installed)"
-msgstr "Paquetes dispoñíbeis (sen instalar)"
+#: dselect/pkgdisplay.cc
+#, fuzzy
+#| msgid "Up to date installed packages"
+msgid "Available not installed packages"
+msgstr "Paquetes instalados e ao día"
 
-#: dselect/pkgdisplay.cc:108
+#: dselect/pkgdisplay.cc
 msgid "Removed and no longer available packages"
 msgstr "Paquetes eliminados e que xa non están dispoñíbeis"
 
-#: dselect/pkgdisplay.cc:112
-msgid "Installed packages"
-msgstr "Paquetes instalados"
-
-#: dselect/pkgdisplay.cc:113
+#: dselect/pkgdisplay.cc
 msgid "Removed packages (configuration still present)"
 msgstr "Paquetes eliminados (aínda está presente a configuración)"
 
-#: dselect/pkgdisplay.cc:114
+#: dselect/pkgdisplay.cc
 msgid "Purged packages and those never installed"
 msgstr "Paquetes purgados e non instalados nunca"
 
-#: dselect/pkgdisplay.cc:116
-msgid "Installed"
-msgstr "Instalados"
-
-#: dselect/pkgdisplay.cc:118
+#: dselect/pkgdisplay.cc
 msgid "Purged"
 msgstr "Purgados"
 
-#: dselect/pkgdisplay.cc:138
+#: dselect/pkgdisplay.cc
 msgid "Error"
 msgstr "Erro"
 
-#: dselect/pkgdisplay.cc:139
+#: dselect/pkgdisplay.cc
 msgid "Installed?"
 msgstr "Está instalado?"
 
-#: dselect/pkgdisplay.cc:140
+#: dselect/pkgdisplay.cc
 msgid "Old mark"
 msgstr "Marca antiga"
 
-#: dselect/pkgdisplay.cc:141
+#: dselect/pkgdisplay.cc
 msgid "Marked for"
 msgstr "Marcado para"
 
-#: dselect/pkgdisplay.cc:143
+#: dselect/pkgdisplay.cc
 msgid "EIOM"
 msgstr "EIAM"
 
-#: dselect/pkgdisplay.cc:147 dselect/pkgdisplay.cc:150
+#: dselect/pkgdisplay.cc
 msgid "Section"
 msgstr "Sección"
 
-#: dselect/pkgdisplay.cc:148
+#: dselect/pkgdisplay.cc
 msgid "Priority"
 msgstr "Prioridade"
 
-#: dselect/pkgdisplay.cc:152
+#: dselect/pkgdisplay.cc
 msgid "Package"
 msgstr "Paquete"
 
-#: dselect/pkgdisplay.cc:161 dselect/pkgdisplay.cc:165
+#: dselect/pkgdisplay.cc
 #, fuzzy
 #| msgid "Avail.ver"
 msgid "Avail.arch"
 msgstr "Ver. dispo"
 
-#: dselect/pkgdisplay.cc:164
+#: dselect/pkgdisplay.cc
 #, fuzzy
 #| msgid "Inst.ver"
 msgid "Inst.arch"
 msgstr "Ver. inst"
 
-#: dselect/pkgdisplay.cc:178 dselect/pkgdisplay.cc:182
+#: dselect/pkgdisplay.cc
 msgid "Avail.ver"
 msgstr "Ver. dispo"
 
-#: dselect/pkgdisplay.cc:181
+#: dselect/pkgdisplay.cc
 msgid "Inst.ver"
 msgstr "Ver. inst"
 
-#: dselect/pkgdisplay.cc:197
+#: dselect/pkgdisplay.cc
 msgid "dselect - recursive package listing"
 msgstr "dselect - lista recursiva de paquetes"
 
-#: dselect/pkgdisplay.cc:199
+#: dselect/pkgdisplay.cc
 msgid "dselect - inspection of package states"
 msgstr "dselect - inspección dos estados dos paquetes"
 
-#: dselect/pkgdisplay.cc:200
+#: dselect/pkgdisplay.cc
 msgid "dselect - main package listing"
 msgstr "dselect - lista principal de paquetes"
 
-#: dselect/pkgdisplay.cc:208
+#: dselect/pkgdisplay.cc
 msgid " (by section)"
 msgstr " (por sección)"
 
-#: dselect/pkgdisplay.cc:211
+#: dselect/pkgdisplay.cc
 msgid " (avail., section)"
 msgstr " (dispo., sección)"
 
-#: dselect/pkgdisplay.cc:214
+#: dselect/pkgdisplay.cc
 msgid " (status, section)"
 msgstr " (estado, sección)"
 
-#: dselect/pkgdisplay.cc:223
+#: dselect/pkgdisplay.cc
 msgid " (by priority)"
 msgstr " (por prioridade)"
 
-#: dselect/pkgdisplay.cc:226
+#: dselect/pkgdisplay.cc
 msgid " (avail., priority)"
 msgstr " (dispo., prioridade)"
 
-#: dselect/pkgdisplay.cc:229
+#: dselect/pkgdisplay.cc
 msgid " (status, priority)"
 msgstr " (estado, prioridade)"
 
-#: dselect/pkgdisplay.cc:238
+#: dselect/pkgdisplay.cc
 msgid " (alphabetically)"
 msgstr " (alfabeticamente)"
 
-#: dselect/pkgdisplay.cc:241
+#: dselect/pkgdisplay.cc
 msgid " (by availability)"
 msgstr " (por dispoñibilidade)"
 
-#: dselect/pkgdisplay.cc:244
+#: dselect/pkgdisplay.cc
 msgid " (by status)"
 msgstr " (por estado)"
 
-#: dselect/pkgdisplay.cc:259
+#: dselect/pkgdisplay.cc
 msgid " mark:+/=/- terse:v help:?"
 msgstr " marcar:+/=/- breve:v axuda:?"
 
-#: dselect/pkgdisplay.cc:260
+#: dselect/pkgdisplay.cc
 msgid " mark:+/=/- verbose:v help:?"
 msgstr " marcar:+/=/- expandido:v axuda:?"
 
-#: dselect/pkgdisplay.cc:262
+#: dselect/pkgdisplay.cc
 msgid " terse:v help:?"
 msgstr " breve:v axuda:?"
 
-#: dselect/pkgdisplay.cc:263
+#: dselect/pkgdisplay.cc
 msgid " verbose:v help:?"
 msgstr " expandido:v axuda:?"
 
-#: dselect/pkginfo.cc:85
+#: dselect/pkginfo.cc
 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 "
@@ -1647,82 +1661,114 @@ msgstr ""
 "Pode empregar \"o\" e \"O\" para trocar a orde e para ter a posibilidade de "
 "marcar paquetes de distintos tipos de grupos."
 
-#: dselect/pkginfo.cc:98
+#: dselect/pkginfo.cc
 msgid "Interrelationships"
 msgstr "Interrelacións"
 
-#: dselect/pkginfo.cc:117
+#: dselect/pkginfo.cc
 msgid "No description available."
 msgstr "Non hai nengunha descrición dispoñíbel."
 
-#: dselect/pkginfo.cc:135
+#: dselect/pkginfo.cc
 msgid "Installed control file information"
 msgstr "Información do ficheiro de control instalado"
 
-#: dselect/pkginfo.cc:151
+#: dselect/pkginfo.cc
 msgid "Available control file information"
 msgstr "Versión dispoñíbel da información do ficheiro de control"
 
-#: dselect/pkglist.cc:425
+#: dselect/pkglist.cc
 #, fuzzy
 #| msgid "Installed packages"
 msgid "there are no packages"
 msgstr "Paquetes instalados"
 
-#: dselect/pkglist.cc:521
+#: dselect/pkglist.cc
 msgid "invalid search option given"
 msgstr "forneceuse unha opción de procura non válida"
 
-#: dselect/pkglist.cc:536
+#: dselect/pkglist.cc
 msgid "error in regular expression"
 msgstr "erro na expresión regular"
 
-#: dselect/pkgsublist.cc:111
+#: dselect/pkgsublist.cc
 msgid " does not appear to be available\n"
 msgstr " non semella que estea dispoñíbel\n"
 
-#: dselect/pkgsublist.cc:131
+#: dselect/pkgsublist.cc
 msgid " or "
 msgstr " ou "
 
-#: dselect/pkgtop.cc:58
+#: dselect/pkgtop.cc
 msgid "All"
 msgstr "Todos"
 
-#: dselect/pkgtop.cc:80
+#: dselect/pkgtop.cc
 msgid "All packages"
 msgstr "Todos os paquetes"
 
-#: dselect/pkgtop.cc:84
+#: dselect/pkgtop.cc
 #, c-format
 msgid "%s packages without a section"
 msgstr "%s paquetes sen sección"
 
-#: dselect/pkgtop.cc:86
+#: dselect/pkgtop.cc
 #, c-format
 msgid "%s packages in section %s"
 msgstr "%s paquetes na sección %s"
 
-#: dselect/pkgtop.cc:92
+#: dselect/pkgtop.cc
 #, c-format
 msgid "%s %s packages"
 msgstr "%s paquetes %s"
 
-#: dselect/pkgtop.cc:96
+#: dselect/pkgtop.cc
 #, c-format
 msgid "%s %s packages without a section"
 msgstr "%s paquetes %s sen sección"
 
-#: dselect/pkgtop.cc:98
+#: dselect/pkgtop.cc
 #, c-format
 msgid "%s %s packages in section %s"
 msgstr "%s paquetes %s na sección %s"
 
-#: dselect/pkgtop.cc:119
+#: dselect/pkgtop.cc
 #, c-format
 msgid "%-*s %s%s%s;  %s (was: %s).  %s"
 msgstr "%-*s %s%s%s;  %s (era: %s). %s"
 
+#, fuzzy
+#~| msgid "Section"
+#~ msgid "Actions:\n"
+#~ msgstr "Sección"
+
+#~ msgid "Colours:\n"
+#~ msgstr "Cores:\n"
+
+#~ msgid "Attributes:\n"
+#~ msgstr "Atributos:\n"
+
+#~ msgid "EOF before option name start"
+#~ msgstr "fin de ficheiro antes do comezo do nome da opción"
+
+#~ msgid "EOF before summary"
+#~ msgstr "fin de ficheiro antes do resumo"
+
+#~ msgid "!Bug!"
+#~ msgstr "¡Bug!"
+
+#~ msgid "Updated"
+#~ msgstr "Actualizados"
+
+#~ msgid "Up-to-date"
+#~ msgstr "Ao día"
+
+#~ msgid "Updated packages (newer version is available)"
+#~ msgstr "Paquetes actualizados (hai unha nova versión dispoñíbel)"
+
+#~ msgid "Available packages (not currently installed)"
+#~ msgstr "Paquetes dispoñíbeis (sen instalar)"
+
 #~ msgid ""
 #~ "Actions:\n"
 #~ "  access update select install config remove quit\n"
diff --git a/dselect/po/hu.po b/dselect/po/hu.po
index 60cb87c26..503c20b63 100644
--- a/dselect/po/hu.po
+++ b/dselect/po/hu.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dselect 1.17.0\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2014-12-23 18:12+0100\n"
+"POT-Creation-Date: 2015-04-06 09:37+0200\n"
 "PO-Revision-Date: 2006-10-06 03:48+0100\n"
 "Last-Translator: SZERVÁC Attila <sas@321.hu>\n"
 "Language-Team: Hungarian <debian-l10n-hungarian@lists.debian.org>\n"
@@ -14,27 +14,27 @@ msgstr ""
 "X-Poedit-Country: HUNGARY\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: dselect/basecmds.cc:125
+#: dselect/basecmds.cc
 msgid "Search for ? "
 msgstr "Keresés:"
 
-#: dselect/basecmds.cc:149
+#: dselect/basecmds.cc
 msgid "Error: "
 msgstr "Hiba:"
 
-#: dselect/basecmds.cc:180
+#: dselect/basecmds.cc
 msgid "Help: "
 msgstr "Súgó:"
 
-#: dselect/basecmds.cc:186
+#: dselect/basecmds.cc
 msgid "Press ? for help menu, . for next topic, <space> to exit help."
 msgstr "A ? súgó menüjét adja, a . lép, a <space> kilép a súgóból."
 
-#: dselect/basecmds.cc:193
+#: dselect/basecmds.cc
 msgid "Help information is available under the following topics:"
 msgstr "Az alábbiakról érhető el súgó:"
 
-#: dselect/basecmds.cc:201
+#: dselect/basecmds.cc
 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. "
@@ -42,243 +42,243 @@ msgstr ""
 "Üss le egy billentyűt a fentiekből, <space> vagy `q' a kilépés,\n"
 "  a `.' egymás után olvassa a súgó lapjait."
 
-#: dselect/basecmds.cc:207
+#: dselect/basecmds.cc
 msgid "error reading keyboard in help"
 msgstr "hiba a billentyűzet olvasásakor a súgóban"
 
-#: dselect/baselist.cc:60
+#: dselect/baselist.cc
 msgid "ioctl(TIOCGWINSZ) failed"
 msgstr "ioctl(TIOCGWINSZ) sikertelen"
 
-#: dselect/baselist.cc:63
+#: dselect/baselist.cc
 msgid "doupdate in SIGWINCH handler failed"
 msgstr "doupdate a SIGWINCH kezelőben sikertelen"
 
-#: dselect/baselist.cc:72
+#: dselect/baselist.cc
 msgid "failed to restore old SIGWINCH sigact"
 msgstr ""
 
-#: dselect/baselist.cc:75
+#: dselect/baselist.cc
 msgid "failed to restore old signal mask"
 msgstr ""
 
-#: dselect/baselist.cc:86
+#: dselect/baselist.cc
 msgid "failed to get old signal mask"
 msgstr ""
 
-#: dselect/baselist.cc:88
+#: dselect/baselist.cc
 msgid "failed to get old SIGWINCH sigact"
 msgstr ""
 
-#: dselect/baselist.cc:93
+#: dselect/baselist.cc
 msgid "failed to block SIGWINCH"
 msgstr ""
 
-#: dselect/baselist.cc:99
+#: dselect/baselist.cc
 msgid "failed to set new SIGWINCH sigact"
 msgstr ""
 
-#: dselect/baselist.cc:174
+#: dselect/baselist.cc
 msgid "failed to allocate colour pair"
 msgstr ""
 
-#: dselect/baselist.cc:203
+#: dselect/baselist.cc
 msgid "failed to create title window"
 msgstr ""
 
-#: dselect/baselist.cc:207
+#: dselect/baselist.cc
 msgid "failed to create whatinfo window"
 msgstr ""
 
-#: dselect/baselist.cc:211
+#: dselect/baselist.cc
 msgid "failed to create baselist pad"
 msgstr ""
 
-#: dselect/baselist.cc:214
+#: dselect/baselist.cc
 msgid "failed to create heading pad"
 msgstr ""
 
-#: dselect/baselist.cc:218
+#: dselect/baselist.cc
 msgid "failed to create thisstate pad"
 msgstr ""
 
-#: dselect/baselist.cc:222
+#: dselect/baselist.cc
 msgid "failed to create info pad"
 msgstr ""
 
-#: dselect/baselist.cc:227
+#: dselect/baselist.cc
 msgid "failed to create query window"
 msgstr ""
 
-#: dselect/baselist.cc:298
+#: dselect/baselist.cc
 #, fuzzy
 msgid "Keybindings"
 msgstr "billentyűk"
 
-#: dselect/baselist.cc:347
+#: dselect/baselist.cc
 #, c-format
 msgid "  -- %d%%, press "
 msgstr ""
 
-#: dselect/baselist.cc:350
+#: dselect/baselist.cc
 #, c-format
 msgid "%s for more"
 msgstr ""
 
-#: dselect/baselist.cc:354
+#: dselect/baselist.cc
 #, c-format
 msgid "%s to go back"
 msgstr ""
 
-#: dselect/bindings.cc:78
+#: dselect/bindings.cc
 msgid "[not bound]"
 msgstr ""
 
-#: dselect/bindings.cc:82
+#: dselect/bindings.cc
 #, c-format
 msgid "[unk: %d]"
 msgstr ""
 
-#: dselect/bindings.cc:141
+#: dselect/bindings.cc
 msgid "Scroll onwards through help/information"
 msgstr "Görgetés előre"
 
-#: dselect/bindings.cc:142
+#: dselect/bindings.cc
 msgid "Scroll backwards through help/information"
 msgstr "Görgetés vissza"
 
-#: dselect/bindings.cc:143
+#: dselect/bindings.cc
 msgid "Move up"
 msgstr "Fel"
 
-#: dselect/bindings.cc:144
+#: dselect/bindings.cc
 msgid "Move down"
 msgstr "Le"
 
-#: dselect/bindings.cc:145
+#: dselect/bindings.cc
 msgid "Go to top of list"
 msgstr "A lista elejére"
 
-#: dselect/bindings.cc:146
+#: dselect/bindings.cc
 msgid "Go to end of list"
 msgstr "A lista végére"
 
-#: dselect/bindings.cc:147
+#: dselect/bindings.cc
 msgid "Request help (cycle through help screens)"
 msgstr ""
 
-#: dselect/bindings.cc:148
+#: dselect/bindings.cc
 msgid "Cycle through information displays"
 msgstr ""
 
-#: dselect/bindings.cc:149
+#: dselect/bindings.cc
 msgid "Redraw display"
 msgstr ""
 
-#: dselect/bindings.cc:150
+#: dselect/bindings.cc
 msgid "Scroll onwards through list by 1 line"
 msgstr "Előre 1 sorral"
 
-#: dselect/bindings.cc:151
+#: dselect/bindings.cc
 msgid "Scroll backwards through list by 1 line"
 msgstr "Vissza egy sorral"
 
-#: dselect/bindings.cc:152
+#: dselect/bindings.cc
 msgid "Scroll onwards through help/information by 1 line"
 msgstr "Előre 1 sorral a súgóban"
 
-#: dselect/bindings.cc:153
+#: dselect/bindings.cc
 msgid "Scroll backwards through help/information by 1 line"
 msgstr "Vissza 1 sorral a súgóban"
 
-#: dselect/bindings.cc:154
+#: dselect/bindings.cc
 msgid "Scroll onwards through list"
 msgstr "Előre a listákon"
 
-#: dselect/bindings.cc:155
+#: dselect/bindings.cc
 msgid "Scroll backwards through list"
 msgstr "Hátra a listákon"
 
-#: dselect/bindings.cc:158
+#: dselect/bindings.cc
 msgid "Mark package(s) for installation"
 msgstr "Csomag(ok) kijelölése telepítésre"
 
-#: dselect/bindings.cc:159
+#: dselect/bindings.cc
 msgid "Mark package(s) for deinstallation"
 msgstr "Csomag(ok) kijelölése eltávolításra"
 
-#: dselect/bindings.cc:160
+#: dselect/bindings.cc
 msgid "Mark package(s) for deinstall and purge"
 msgstr "Csomag(ok) kijelölése eltávolításra és törlésre"
 
-#: dselect/bindings.cc:161
+#: dselect/bindings.cc
 msgid "Make highlight more specific"
 msgstr ""
 
-#: dselect/bindings.cc:162
+#: dselect/bindings.cc
 msgid "Make highlight less specific"
 msgstr ""
 
-#: dselect/bindings.cc:163
+#: dselect/bindings.cc
 msgid "Search for a package whose name contains a string"
 msgstr "Keresés a csomagok neveiben"
 
-#: dselect/bindings.cc:164
+#: dselect/bindings.cc
 #, fuzzy
 #| msgid "Repeat last search."
 msgid "Repeat last search"
 msgstr "Utolsó keresés ismétlése."
 
-#: dselect/bindings.cc:165
+#: dselect/bindings.cc
 msgid "Swap sort order priority/section"
 msgstr "Rendezés elsőbbség vagy szakasz alapján"
 
-#: dselect/bindings.cc:166
+#: dselect/bindings.cc
 msgid "Quit, confirming, and checking dependencies"
 msgstr "Kilépés, megerősítés és függőségek ellenőrzése"
 
-#: dselect/bindings.cc:167
+#: dselect/bindings.cc
 msgid "Quit, confirming without check"
 msgstr "Kilépés, megerősítés ellenőrzés nélkül"
 
-#: dselect/bindings.cc:168
+#: dselect/bindings.cc
 msgid "Quit, rejecting conflict/dependency suggestions"
 msgstr "Kilépés, ütközés/függőségi javaslatok elvetése"
 
-#: dselect/bindings.cc:169
+#: dselect/bindings.cc
 msgid "Abort - quit without making changes"
 msgstr "Elvetés - kilépés változások nélkül"
 
-#: dselect/bindings.cc:170
+#: dselect/bindings.cc
 msgid "Revert to old state for all packages"
 msgstr "Csomagok régi állapotának visszaállítása"
 
-#: dselect/bindings.cc:171
+#: dselect/bindings.cc
 msgid "Revert to suggested state for all packages"
 msgstr "Csomagok javasolt állapotának visszaállítása"
 
-#: dselect/bindings.cc:172
+#: dselect/bindings.cc
 msgid "Revert to directly requested state for all packages"
 msgstr "Csomagok közvetlenül kért állapotának visszaállítása"
 
-#: dselect/bindings.cc:173
+#: dselect/bindings.cc
 #, fuzzy
 msgid "Revert to currently installed state for all packages"
 msgstr "Csomagok közvetlenül kért állapotának visszaállítása"
 
-#: dselect/bindings.cc:176
+#: dselect/bindings.cc
 msgid "Select currently-highlighted access method"
 msgstr "Most kiemelt hozzáférési mód kiválasztása"
 
-#: dselect/bindings.cc:177
+#: dselect/bindings.cc
 msgid "Quit without changing selected access method"
 msgstr "Kilépés a választott hozzáférési mód változtatása nélkül"
 
-#: dselect/helpmsgs.cc:29
+#: dselect/helpmsgs.cc
 msgid "Keystrokes"
 msgstr "Billentyűk"
 
-#: dselect/helpmsgs.cc:29
+#: dselect/helpmsgs.cc
 msgid ""
 "Motion keys: Next/Previous, Top/End, Up/Down, Backwards/Forwards:\n"
 "  j, Down-arrow         k, Up-arrow             move highlight\n"
@@ -310,11 +310,11 @@ msgid ""
 "   D     set all to Directly requested state  n, \\  repeat last search\n"
 msgstr ""
 
-#: dselect/helpmsgs.cc:55
+#: dselect/helpmsgs.cc
 msgid "Introduction to package selections"
 msgstr "Bevezetés a csomagválasztásba"
 
-#: dselect/helpmsgs.cc:55
+#: dselect/helpmsgs.cc
 msgid ""
 "Welcome to dselect's main package listing.\n"
 "\n"
@@ -366,11 +366,11 @@ msgstr ""
 "függőségek végső ellenőrzése megtörténik - ismét egy listát kapsz.\n"
 "Üsd le a <szóköz> billentyűt a súgó elhagyásához és lépj be a listába most!\n"
 
-#: dselect/helpmsgs.cc:80
+#: dselect/helpmsgs.cc
 msgid "Introduction to read-only package list browser"
 msgstr "Bevezetés a csak-olvasható csomag lista böngészésbe"
 
-#: dselect/helpmsgs.cc:80
+#: dselect/helpmsgs.cc
 msgid ""
 "Welcome to dselect's main package listing.\n"
 "\n"
@@ -406,11 +406,11 @@ msgstr ""
 "\n"
 "Üsd le a <szóköz> billentyűt a súgó elhagyásához és lépj be a listába most!\n"
 
-#: dselect/helpmsgs.cc:99
+#: dselect/helpmsgs.cc
 msgid "Introduction to conflict/dependency resolution sub-list"
 msgstr ""
 
-#: dselect/helpmsgs.cc:99
+#: dselect/helpmsgs.cc
 msgid ""
 "Dependency/conflict resolution - introduction.\n"
 "\n"
@@ -445,11 +445,11 @@ msgid ""
 "help.\n"
 msgstr ""
 
-#: dselect/helpmsgs.cc:125
+#: dselect/helpmsgs.cc
 msgid "Display, part 1: package listing and status chars"
 msgstr ""
 
-#: dselect/helpmsgs.cc:125
+#: dselect/helpmsgs.cc
 msgid ""
 "The top half of the screen shows a list of packages.  For each package you "
 "see\n"
@@ -482,11 +482,11 @@ msgid ""
 "description.\n"
 msgstr ""
 
-#: dselect/helpmsgs.cc:152
+#: dselect/helpmsgs.cc
 msgid "Display, part 2: list highlight; information display"
 msgstr ""
 
-#: dselect/helpmsgs.cc:152
+#: dselect/helpmsgs.cc
 msgid ""
 "* Highlight: One line in the package list will be highlighted.  It "
 "indicates\n"
@@ -513,11 +513,11 @@ msgid ""
 "  information display or expand it to use almost all of the screen.\n"
 msgstr ""
 
-#: dselect/helpmsgs.cc:176
+#: dselect/helpmsgs.cc
 msgid "Introduction to method selection display"
 msgstr ""
 
-#: dselect/helpmsgs.cc:176
+#: dselect/helpmsgs.cc
 msgid ""
 "dselect and dpkg can do automatic installation, loading the package files to "
 "be\n"
@@ -541,11 +541,11 @@ msgid ""
 "menu reachable by pressing `?'.\n"
 msgstr ""
 
-#: dselect/helpmsgs.cc:196
+#: dselect/helpmsgs.cc
 msgid "Keystrokes for method selection"
 msgstr ""
 
-#: dselect/helpmsgs.cc:196
+#: dselect/helpmsgs.cc
 msgid ""
 "Motion keys: Next/Previous, Top/End, Up/Down, Backwards/Forwards:\n"
 "  j, Down-arrow         k, Up-arrow             move highlight\n"
@@ -570,106 +570,106 @@ msgid ""
 "  \\                repeat last search\n"
 msgstr ""
 
-#: dselect/main.cc:63
+#: dselect/main.cc
 msgid "Type dselect --help for help."
 msgstr "A dselect --help adja a súgót"
 
-#: dselect/main.cc:145
+#: dselect/main.cc
 msgid "a"
 msgstr "e"
 
 # MAX  ENNÉL  3-AL !!!!!  TÖBB KARAKTER !
 # - sas
-#: dselect/main.cc:145
+#: dselect/main.cc
 msgid "[A]ccess"
 msgstr "[E]lérés"
 
-#: dselect/main.cc:145
+#: dselect/main.cc
 msgid "Choose the access method to use."
 msgstr "Válassz elérési módot"
 
-#: dselect/main.cc:146
+#: dselect/main.cc
 msgid "u"
 msgstr "f"
 
-#: dselect/main.cc:146
+#: dselect/main.cc
 msgid "[U]pdate"
 msgstr "[F]rissítés"
 
-#: dselect/main.cc:146
+#: dselect/main.cc
 msgid "Update list of available packages, if possible."
 msgstr "Frissíti az elérhető csomagok listáját, ha lehetséges."
 
-#: dselect/main.cc:147
+#: dselect/main.cc
 msgid "s"
 msgstr "v"
 
-#: dselect/main.cc:147
+#: dselect/main.cc
 msgid "[S]elect"
 msgstr "[V]álasztás"
 
-#: dselect/main.cc:147
+#: dselect/main.cc
 msgid "Request which packages you want on your system."
 msgstr "Csomagok választása"
 
-#: dselect/main.cc:148
+#: dselect/main.cc
 msgid "i"
 msgstr "t"
 
-#: dselect/main.cc:148
+#: dselect/main.cc
 msgid "[I]nstall"
 msgstr "[T]elepítés"
 
-#: dselect/main.cc:148
+#: dselect/main.cc
 msgid "Install and upgrade wanted packages."
 msgstr "Kért csomagok telepítése, frissítése."
 
-#: dselect/main.cc:149
+#: dselect/main.cc
 msgid "c"
 msgstr "b"
 
-#: dselect/main.cc:149
+#: dselect/main.cc
 msgid "[C]onfig"
 msgstr "[B]eállítás"
 
-#: dselect/main.cc:149
+#: dselect/main.cc
 msgid "Configure any packages that are unconfigured."
 msgstr "Beállítatlan csomagok beállítása."
 
-#: dselect/main.cc:150
+#: dselect/main.cc
 msgid "r"
 msgstr "l"
 
-#: dselect/main.cc:150
+#: dselect/main.cc
 msgid "[R]emove"
 msgstr "[L]eszedés"
 
-#: dselect/main.cc:150
+#: dselect/main.cc
 msgid "Remove unwanted software."
 msgstr "Nem kívánt szoftverek eltávolítása."
 
-#: dselect/main.cc:151
+#: dselect/main.cc
 msgid "q"
 msgstr "k"
 
-#: dselect/main.cc:151
+#: dselect/main.cc
 msgid "[Q]uit"
 msgstr "[K]ilépés"
 
-#: dselect/main.cc:151
+#: dselect/main.cc
 msgid "Quit dselect."
 msgstr "Kilépés a dselect programból."
 
-#: dselect/main.cc:152
+#: dselect/main.cc
 msgid "menu"
 msgstr "menü"
 
-#: dselect/main.cc:157
+#: dselect/main.cc
 #, c-format
 msgid "Debian `%s' package handling frontend version %s.\n"
 msgstr "Debian `%s' csomagkezelő felület %s verzió.\n"
 
-#: dselect/main.cc:160
+#: dselect/main.cc
 #, fuzzy
 msgid ""
 "This is free software; see the GNU General Public License version 2 or\n"
@@ -679,18 +679,23 @@ msgstr ""
 "változatát a másolási feltételekért.  NINCS garancia.\n"
 "L. a %s  --licence opciót a szerzői jogi és licenc részletekért.\n"
 
-#: dselect/main.cc:169 dselect/main.cc:217
+#: dselect/main.cc
 msgid "<standard output>"
 msgstr ""
 
-#: dselect/main.cc:180
+#: dselect/main.cc
 #, c-format
 msgid ""
-"Usage: %s [<option> ...] [<action> ...]\n"
+"Usage: %s [<option>...] [<command>...]\n"
 "\n"
 msgstr ""
 
-#: dselect/main.cc:184
+#: dselect/main.cc
+#, c-format
+msgid "Commands:\n"
+msgstr ""
+
+#: dselect/main.cc
 #, fuzzy, c-format
 #| msgid ""
 #| "Options:\n"
@@ -704,12 +709,12 @@ msgstr ""
 #| "\n"
 msgid ""
 "Options:\n"
-"  --admindir <directory>     Use <directory> instead of %s.\n"
-"  --expert                   Turn on expert mode.\n"
-"  --debug <file> | -D<file>  Turn on debugging, sending output to <file>.\n"
-"  --colour | --color screenpart:[foreground],[background][:attr[+attr+...]]\n"
-"                             Configure screen colours.\n"
-"\n"
+"      --admindir <directory>       Use <directory> instead of %s.\n"
+"      --expert                     Turn on expert mode.\n"
+"  -D, --debug <file>               Turn on debugging, send output to "
+"<file>.\n"
+"      --color <color-spec>         Configure screen colors.\n"
+"      --colour <color-spec>        Ditto.\n"
 msgstr ""
 "Lehetőségek:\n"
 "  --admindir <könyvtár>      <directory> használata %s helyett.\n"
@@ -718,73 +723,75 @@ msgstr ""
 "  --colour | --color képernyőrész:[előtér],[háttér][:attr[+attr+..]]\n"
 "                             Képernyőszínek beállítása.\n"
 
-#: dselect/main.cc:193
+#: dselect/main.cc
 #, c-format
 msgid ""
-"  --help                     Show this help message.\n"
-"  --version                  Show the version.\n"
+"  -?, --help                       Show this help message.\n"
+"      --version                    Show the version.\n"
 "\n"
 msgstr ""
 
-#: dselect/main.cc:197
-#, fuzzy, c-format
-#| msgid "Section"
-msgid "Actions:\n"
-msgstr "Szakasz"
-
-#: dselect/main.cc:202
+#: dselect/main.cc
 #, c-format
-msgid "Screenparts:\n"
+msgid ""
+"<color-spec> is <screen-part>:[<foreground>],[<background>][:"
+"<attr>[+<attr>]...]\n"
+msgstr ""
+
+#: dselect/main.cc
+#, fuzzy, c-format
+#| msgid "Screenparts:\n"
+msgid "<screen-part> is:"
 msgstr "Képernyőrészek:\n"
 
-#: dselect/main.cc:207
+#: dselect/main.cc
 #, c-format
-msgid "Colours:\n"
-msgstr "Színek:\n"
+msgid "<color> is:"
+msgstr ""
 
-#: dselect/main.cc:212
+#: dselect/main.cc
 #, c-format
-msgid "Attributes:\n"
-msgstr "Attribútumok:\n"
+msgid "<attr> is:"
+msgstr ""
 
-#: dselect/main.cc:232
+#: dselect/main.cc
 #, c-format
 msgid "couldn't open debug file `%.255s'\n"
 msgstr "sikertelen `%.255s' hibajavító fájl megnyitás\n"
 
-#: dselect/main.cc:253
+#: dselect/main.cc
 #, fuzzy, c-format
 #| msgid "Invalid %s `%s'\n"
 msgid "invalid %s '%s'"
 msgstr "Érvénytelen %s `%s'\n"
 
-#: dselect/main.cc:272
+#: dselect/main.cc
 msgid "screen part"
 msgstr "képernyőrész"
 
-#: dselect/main.cc:278
+#: dselect/main.cc
 #, fuzzy
 #| msgid "Null colour specification\n"
 msgid "null colour specification"
 msgstr "nincs szín megadva\n"
 
-#: dselect/main.cc:286 dselect/main.cc:291
+#: dselect/main.cc
 msgid "colour"
 msgstr "szín"
 
-#: dselect/main.cc:299
+#: dselect/main.cc
 msgid "colour attribute"
 msgstr "színattribútum"
 
-#: dselect/main.cc:333
+#: dselect/main.cc
 msgid "Terminal does not appear to support cursor addressing.\n"
 msgstr "Úgy fest, a terminál nem támogatja a kurzorcímzést.\n"
 
-#: dselect/main.cc:335
+#: dselect/main.cc
 msgid "Terminal does not appear to support highlighting.\n"
 msgstr "Úgy fest, a terminál nem támogatja a kiemelést.\n"
 
-#: dselect/main.cc:337
+#: dselect/main.cc
 #, c-format
 msgid ""
 "Set your TERM variable correctly, use a better terminal,\n"
@@ -793,11 +800,11 @@ msgstr ""
 "Javítsd a TERM változót, használj jobb terminált,\n"
 "vagy dolgozz e problémát elkerülő csomagkezelővel: %s.\n"
 
-#: dselect/main.cc:340
+#: dselect/main.cc
 msgid "terminal lacks necessary features, giving up"
 msgstr "a terminál nem bír a szükséges képességekkel, feladom"
 
-#: dselect/main.cc:425
+#: dselect/main.cc
 msgid ""
 "\n"
 "\n"
@@ -811,7 +818,7 @@ msgstr ""
 "Üss <enter>-t a választás megerősítéséhez. A ^L frissíti a képernyőt.\n"
 "\n"
 
-#: dselect/main.cc:430
+#: dselect/main.cc
 msgid ""
 "Copyright (C) 1994-1996 Ian Jackson.\n"
 "Copyright (C) 2000,2001 Wichert Akkerman.\n"
@@ -819,7 +826,7 @@ msgstr ""
 "Copyright (C) 1994-1996 Ian Jackson.\n"
 "Copyright (C) 2000,2001 Wichert Akkerman.\n"
 
-#: dselect/main.cc:436
+#: dselect/main.cc
 msgid ""
 "\n"
 "\n"
@@ -829,57 +836,57 @@ msgstr ""
 "\n"
 "Csak-olvasható hozzáférésed van: csak a választások előnézete érhető el!"
 
-#: dselect/main.cc:455
+#: dselect/main.cc
 msgid "failed to getch in main menu"
 msgstr "a főmenü elérése meghiúsult"
 
-#: dselect/main.cc:538
+#: dselect/main.cc
 #, c-format
 msgid "unknown action string `%.50s'"
 msgstr "ismeretlen `%.50s' művelet sztring"
 
-#: dselect/methlist.cc:66
+#: dselect/methlist.cc
 msgid "Abbrev."
 msgstr "Röv."
 
-#: dselect/methlist.cc:67 dselect/pkgdisplay.cc:188 dselect/pkginfo.cc:110
+#: dselect/methlist.cc dselect/pkgdisplay.cc dselect/pkginfo.cc
 msgid "Description"
 msgstr "Leírás"
 
-#: dselect/methlist.cc:73
+#: dselect/methlist.cc
 msgid "dselect - list of access methods"
 msgstr "dselect - elérési módok listája"
 
-#: dselect/methlist.cc:82
+#: dselect/methlist.cc
 #, c-format
 msgid "Access method `%s'."
 msgstr "`%s' elérési mód."
 
-#: dselect/methlist.cc:161 dselect/pkglist.cc:587
+#: dselect/methlist.cc dselect/pkglist.cc
 msgid "doupdate failed"
 msgstr "frissítés sikertelen"
 
-#: dselect/methlist.cc:164 dselect/pkglist.cc:590
+#: dselect/methlist.cc dselect/pkglist.cc
 msgid "failed to unblock SIGWINCH"
 msgstr ""
 
-#: dselect/methlist.cc:169 dselect/pkglist.cc:595
+#: dselect/methlist.cc dselect/pkglist.cc
 msgid "failed to re-block SIGWINCH"
 msgstr ""
 
-#: dselect/methlist.cc:170 dselect/pkglist.cc:597
+#: dselect/methlist.cc dselect/pkglist.cc
 msgid "getch failed"
 msgstr ""
 
-#: dselect/methlist.cc:187
+#: dselect/methlist.cc
 msgid "Explanation"
 msgstr ""
 
-#: dselect/methlist.cc:197
+#: dselect/methlist.cc
 msgid "No explanation available."
 msgstr ""
 
-#: dselect/method.cc:67
+#: dselect/method.cc
 #, c-format
 msgid ""
 "\n"
@@ -887,7 +894,7 @@ msgid ""
 "%s: %s\n"
 msgstr ""
 
-#: dselect/method.cc:70
+#: dselect/method.cc
 msgid ""
 "\n"
 "Press <enter> to continue."
@@ -895,191 +902,191 @@ msgstr ""
 "\n"
 "Üss <enter> -t a folytatáshoz."
 
-#: dselect/method.cc:82
+#: dselect/method.cc
 msgid "cannot unlock access method area"
 msgstr ""
 
-#: dselect/method.cc:96
+#: dselect/method.cc
 #, fuzzy
 #| msgid " does not appear to be available\n"
 msgid "no access methods are available"
 msgstr " nem tűnik elérhetőnek\n"
 
-#: dselect/method.cc:115
+#: dselect/method.cc
 msgid "requested operation requires superuser privilege"
 msgstr ""
 
-#: dselect/method.cc:118
+#: dselect/method.cc
 #, fuzzy
 #| msgid "Choose the access method to use."
 msgid "cannot open or create access method lockfile"
 msgstr "Válassz elérési módot"
 
-#: dselect/method.cc:125
+#: dselect/method.cc
 msgid "the access method area is already locked"
 msgstr ""
 
-#: dselect/method.cc:128
+#: dselect/method.cc
 #, fuzzy
 #| msgid "dselect - list of access methods"
 msgid "cannot lock access method area"
 msgstr "dselect - elérési módok listája"
 
-#: dselect/method.cc:161
+#: dselect/method.cc
 #, c-format
 msgid "Press <enter> to continue.\n"
 msgstr "Üss <enter> -t a folytatáshoz.\n"
 
-#: dselect/method.cc:162
+#: dselect/method.cc
 msgid "<standard error>"
 msgstr ""
 
-#: dselect/method.cc:165
+#: dselect/method.cc
 msgid "error reading acknowledgement of program failure message"
 msgstr ""
 
-#: dselect/method.cc:187
+#: dselect/method.cc
 msgid "no access method is selected or configured"
 msgstr ""
 
-#: dselect/method.cc:196
+#: dselect/method.cc
 msgid "update available list script"
 msgstr "elérhetők listáját frissítő parancsfájl"
 
-#: dselect/method.cc:200
+#: dselect/method.cc
 msgid "installation script"
 msgstr "telepítő parancsfájl"
 
-#: dselect/method.cc:246
+#: dselect/method.cc
 msgid "query/setup script"
 msgstr "lekérdező/beállító parancsfájl"
 
-#: dselect/methparse.cc:53
+#: dselect/methparse.cc
 #, c-format
 msgid "syntax error in method options file `%.250s' -- %s"
 msgstr ""
 
-#: dselect/methparse.cc:59
+#: dselect/methparse.cc
 #, c-format
 msgid "error reading options file `%.250s'"
 msgstr ""
 
-#: dselect/methparse.cc:93
+#: dselect/methparse.cc
 #, c-format
 msgid "unable to read `%.250s' directory for reading methods"
 msgstr ""
 
-#: dselect/methparse.cc:109
+#: dselect/methparse.cc
 #, c-format
 msgid "method `%.250s' has name that is too long (%d > %d characters)"
 msgstr ""
 
-#: dselect/methparse.cc:120
+#: dselect/methparse.cc
 #, c-format
 msgid "unable to access method script `%.250s'"
 msgstr ""
 
-#: dselect/methparse.cc:126
+#: dselect/methparse.cc
 #, c-format
 msgid "unable to read method options file `%.250s'"
 msgstr ""
 
-#: dselect/methparse.cc:150
+#: dselect/methparse.cc
 msgid "non-digit where digit wanted"
 msgstr ""
 
-#: dselect/methparse.cc:153
-msgid "EOF in index string"
+#: dselect/methparse.cc
+msgid "end of file in index string"
 msgstr ""
 
-#: dselect/methparse.cc:156
+#: dselect/methparse.cc
 msgid "index string too long"
 msgstr ""
 
-#: dselect/methparse.cc:159
+#: dselect/methparse.cc
 msgid "newline before option name start"
 msgstr ""
 
-#: dselect/methparse.cc:161
-msgid "EOF before option name start"
+#: dselect/methparse.cc
+msgid "end of file before option name start"
 msgstr ""
 
-#: dselect/methparse.cc:165
+#: dselect/methparse.cc
 msgid "nonalpha where option name start wanted"
 msgstr ""
 
-#: dselect/methparse.cc:167
+#: dselect/methparse.cc
 msgid "non-alphanum in option name"
 msgstr ""
 
-#: dselect/methparse.cc:170
-msgid "EOF in option name"
+#: dselect/methparse.cc
+msgid "end of file in option name"
 msgstr ""
 
-#: dselect/methparse.cc:175
+#: dselect/methparse.cc
 msgid "newline before summary"
 msgstr ""
 
-#: dselect/methparse.cc:177
-msgid "EOF before summary"
+#: dselect/methparse.cc
+msgid "end of file before summary"
 msgstr ""
 
-#: dselect/methparse.cc:183
-msgid "EOF in summary - missing newline"
+#: dselect/methparse.cc
+msgid "end of file in summary - missing newline"
 msgstr ""
 
-#: dselect/methparse.cc:193
+#: dselect/methparse.cc
 #, c-format
 msgid "unable to open option description file `%.250s'"
 msgstr ""
 
-#: dselect/methparse.cc:197
+#: dselect/methparse.cc
 #, c-format
 msgid "unable to stat option description file `%.250s'"
 msgstr ""
 
-#: dselect/methparse.cc:201
+#: dselect/methparse.cc
 #, c-format
 msgid "failed to read option description file `%.250s'"
 msgstr ""
 
-#: dselect/methparse.cc:204
+#: dselect/methparse.cc
 #, c-format
 msgid "error during read of option description file `%.250s'"
 msgstr ""
 
-#: dselect/methparse.cc:227
+#: dselect/methparse.cc
 #, c-format
 msgid "error during read of method options file `%.250s'"
 msgstr ""
 
-#: dselect/methparse.cc:250
+#: dselect/methparse.cc
 #, c-format
 msgid "unable to open current option file `%.250s'"
 msgstr ""
 
-#: dselect/methparse.cc:286
+#: dselect/methparse.cc
 #, c-format
 msgid "unable to write new option to `%.250s'"
 msgstr ""
 
-#: dselect/pkgdisplay.cc:36
+#: dselect/pkgdisplay.cc
 msgid "new package"
 msgstr "új csomag"
 
-#: dselect/pkgdisplay.cc:37
+#: dselect/pkgdisplay.cc
 msgid "install"
 msgstr "telepítés"
 
-#: dselect/pkgdisplay.cc:38
+#: dselect/pkgdisplay.cc
 msgid "hold"
 msgstr "megtartás"
 
-#: dselect/pkgdisplay.cc:39
+#: dselect/pkgdisplay.cc
 msgid "remove"
 msgstr "eltávolítás"
 
-#: dselect/pkgdisplay.cc:40
+#: dselect/pkgdisplay.cc
 msgid "purge"
 msgstr "törlés"
 
@@ -1087,331 +1094,325 @@ msgstr "törlés"
 #. * the empty string to store information about the translation. DO NOT
 #. * CHANGE THAT IN A TRANSLATION! The code really relies on that being
 #. * a single space.
-#: dselect/pkgdisplay.cc:47
+#: dselect/pkgdisplay.cc
 msgid " "
 msgstr " "
 
-#: dselect/pkgdisplay.cc:48
+#: dselect/pkgdisplay.cc
 msgid "REINSTALL"
 msgstr "ÚJRATELEPÍTÉS"
 
-#: dselect/pkgdisplay.cc:51
+#: dselect/pkgdisplay.cc
 msgid "not installed"
 msgstr "nem telepített"
 
-#: dselect/pkgdisplay.cc:52
+#: dselect/pkgdisplay.cc
 msgid "removed (configs remain)"
 msgstr "eltávolított (a beállítás maradt)"
 
-#: dselect/pkgdisplay.cc:53
+#: dselect/pkgdisplay.cc
 msgid "half installed"
 msgstr "félig telepített"
 
-#: dselect/pkgdisplay.cc:54
+#: dselect/pkgdisplay.cc
 msgid "unpacked (not set up)"
 msgstr "kicsomagolt (nincs beállítva)"
 
-#: dselect/pkgdisplay.cc:55
+#: dselect/pkgdisplay.cc
 msgid "half configured (config failed)"
 msgstr ""
 
-#: dselect/pkgdisplay.cc:56
+#: dselect/pkgdisplay.cc
 msgid "awaiting trigger processing"
 msgstr ""
 
-#: dselect/pkgdisplay.cc:57
+#: dselect/pkgdisplay.cc
 msgid "triggered"
 msgstr ""
 
-#: dselect/pkgdisplay.cc:58
+#: dselect/pkgdisplay.cc
 msgid "installed"
 msgstr "telepített"
 
-#: dselect/pkgdisplay.cc:61
+#: dselect/pkgdisplay.cc
 msgid "Required"
 msgstr "kötelező - REQ"
 
-#: dselect/pkgdisplay.cc:62
+#: dselect/pkgdisplay.cc
 msgid "Important"
 msgstr "fontos - IMP"
 
-#: dselect/pkgdisplay.cc:63
+#: dselect/pkgdisplay.cc
 msgid "Standard"
 msgstr "szokásos - STD"
 
-#: dselect/pkgdisplay.cc:64
+#: dselect/pkgdisplay.cc
 msgid "Optional"
 msgstr "tetszőleges - OPT"
 
-#: dselect/pkgdisplay.cc:65
+#: dselect/pkgdisplay.cc
 msgid "Extra"
 msgstr "extra - XTR"
 
-#: dselect/pkgdisplay.cc:66
-msgid "!Bug!"
-msgstr "!Hiba! - HIB"
-
-#: dselect/pkgdisplay.cc:67
+#: dselect/pkgdisplay.cc
 msgid "Unclassified"
 msgstr "nem-besorolt"
 
-#: dselect/pkgdisplay.cc:70
+#: dselect/pkgdisplay.cc
 msgid "suggests"
 msgstr "javaslatként adja ezt:"
 
-#: dselect/pkgdisplay.cc:71
+#: dselect/pkgdisplay.cc
 msgid "recommends"
 msgstr "ajánlásként adja ezt:"
 
-#: dselect/pkgdisplay.cc:72
+#: dselect/pkgdisplay.cc
 msgid "depends on"
 msgstr "függ ettől:"
 
-#: dselect/pkgdisplay.cc:73
+#: dselect/pkgdisplay.cc
 msgid "pre-depends on"
 msgstr ""
 
-#: dselect/pkgdisplay.cc:74
+#: dselect/pkgdisplay.cc
 msgid "breaks"
 msgstr ""
 
-#: dselect/pkgdisplay.cc:75
+#: dselect/pkgdisplay.cc
 msgid "conflicts with"
 msgstr "ütközik ezzel:"
 
-#: dselect/pkgdisplay.cc:76
+#: dselect/pkgdisplay.cc
 msgid "provides"
 msgstr ""
 
-#: dselect/pkgdisplay.cc:77
+#: dselect/pkgdisplay.cc
 msgid "replaces"
 msgstr ""
 
-#: dselect/pkgdisplay.cc:78
+#: dselect/pkgdisplay.cc
 msgid "enhances"
 msgstr ""
 
-#: dselect/pkgdisplay.cc:81
+#: dselect/pkgdisplay.cc
 msgid "Req"
 msgstr "Req"
 
-#: dselect/pkgdisplay.cc:82
+#: dselect/pkgdisplay.cc
 msgid "Imp"
 msgstr "Imp"
 
-#: dselect/pkgdisplay.cc:83
+#: dselect/pkgdisplay.cc
 msgid "Std"
 msgstr "Std"
 
-#: dselect/pkgdisplay.cc:84
+#: dselect/pkgdisplay.cc
 msgid "Opt"
 msgstr "Opt"
 
-#: dselect/pkgdisplay.cc:85
+#: dselect/pkgdisplay.cc
 msgid "Xtr"
 msgstr "Xtr"
 
-#: dselect/pkgdisplay.cc:86
+#: dselect/pkgdisplay.cc
 msgid "bUG"
 msgstr "bUG"
 
-#: dselect/pkgdisplay.cc:87
+#: dselect/pkgdisplay.cc
 msgid "?"
 msgstr "?"
 
-#: dselect/pkgdisplay.cc:95 dselect/pkgdisplay.cc:115
+#: dselect/pkgdisplay.cc
 msgid "Broken"
 msgstr "Törött"
 
-#: dselect/pkgdisplay.cc:96
+#: dselect/pkgdisplay.cc
 msgid "New"
 msgstr "Új"
 
-#: dselect/pkgdisplay.cc:97
-msgid "Updated"
-msgstr "Friss"
+#: dselect/pkgdisplay.cc
+msgid "Upgradable"
+msgstr ""
 
-#: dselect/pkgdisplay.cc:98
+#: dselect/pkgdisplay.cc
 msgid "Obsolete/local"
 msgstr "Elavult vagy helyi"
 
-#: dselect/pkgdisplay.cc:99
-msgid "Up-to-date"
-msgstr "Naprakész"
+#: dselect/pkgdisplay.cc
+msgid "Installed"
+msgstr "Telepített"
 
-#: dselect/pkgdisplay.cc:100
+#: dselect/pkgdisplay.cc
 msgid "Available"
 msgstr "Elérhető"
 
-#: dselect/pkgdisplay.cc:101 dselect/pkgdisplay.cc:117
+#: dselect/pkgdisplay.cc
 msgid "Removed"
 msgstr "Eltávolított"
 
-#: dselect/pkgdisplay.cc:102 dselect/pkgdisplay.cc:111
+#: dselect/pkgdisplay.cc
 msgid "Brokenly installed packages"
 msgstr "Törötten telepített csomagok"
 
-#: dselect/pkgdisplay.cc:103
+#: dselect/pkgdisplay.cc
 msgid "Newly available packages"
 msgstr "Legújabb csomagok"
 
-#: dselect/pkgdisplay.cc:104
-msgid "Updated packages (newer version is available)"
-msgstr "Frissíthető csomagok (újabb változat elérhető)"
+#: dselect/pkgdisplay.cc
+#, fuzzy
+#| msgid "Newly available packages"
+msgid "Upgradable packages"
+msgstr "Legújabb csomagok"
 
-#: dselect/pkgdisplay.cc:105
-msgid "Obsolete and local packages present on system"
+#: dselect/pkgdisplay.cc
+#, fuzzy
+#| msgid "Obsolete and local packages present on system"
+msgid "Obsolete and locally created packages"
 msgstr "Elavult és helyi csomagok a rendszeren"
 
-#: dselect/pkgdisplay.cc:106
-msgid "Up to date installed packages"
-msgstr "Naprakész telepített csomagok"
+#: dselect/pkgdisplay.cc
+msgid "Installed packages"
+msgstr "Telepített csomagok"
 
-#: dselect/pkgdisplay.cc:107
-msgid "Available packages (not currently installed)"
-msgstr "Elérhető csomagok (most nincsenek telepítve)"
+#: dselect/pkgdisplay.cc
+#, fuzzy
+#| msgid "Up to date installed packages"
+msgid "Available not installed packages"
+msgstr "Naprakész telepített csomagok"
 
-#: dselect/pkgdisplay.cc:108
+#: dselect/pkgdisplay.cc
 msgid "Removed and no longer available packages"
 msgstr "Visszavont és többé nem elérhető csomagok"
 
-#: dselect/pkgdisplay.cc:112
-msgid "Installed packages"
-msgstr "Telepített csomagok"
-
-#: dselect/pkgdisplay.cc:113
+#: dselect/pkgdisplay.cc
 msgid "Removed packages (configuration still present)"
 msgstr "Eltávolított csomagok (a beállítások még megvannak)"
 
-#: dselect/pkgdisplay.cc:114
+#: dselect/pkgdisplay.cc
 msgid "Purged packages and those never installed"
 msgstr "Törölt és soha nem telepített csomagok"
 
-#: dselect/pkgdisplay.cc:116
-msgid "Installed"
-msgstr "Telepített"
-
-#: dselect/pkgdisplay.cc:118
+#: dselect/pkgdisplay.cc
 msgid "Purged"
 msgstr "Törölt"
 
-#: dselect/pkgdisplay.cc:138
+#: dselect/pkgdisplay.cc
 msgid "Error"
 msgstr "Hiba"
 
-#: dselect/pkgdisplay.cc:139
+#: dselect/pkgdisplay.cc
 msgid "Installed?"
 msgstr "Telepítve van?"
 
-#: dselect/pkgdisplay.cc:140
+#: dselect/pkgdisplay.cc
 msgid "Old mark"
 msgstr "Régi jelölés"
 
-#: dselect/pkgdisplay.cc:141
+#: dselect/pkgdisplay.cc
 msgid "Marked for"
 msgstr "Kijelölés erre:"
 
-#: dselect/pkgdisplay.cc:143
+#: dselect/pkgdisplay.cc
 msgid "EIOM"
 msgstr "EIOM"
 
-#: dselect/pkgdisplay.cc:147 dselect/pkgdisplay.cc:150
+#: dselect/pkgdisplay.cc
 msgid "Section"
 msgstr "Szakasz"
 
-#: dselect/pkgdisplay.cc:148
+#: dselect/pkgdisplay.cc
 msgid "Priority"
 msgstr "Elsőbbség"
 
-#: dselect/pkgdisplay.cc:152
+#: dselect/pkgdisplay.cc
 msgid "Package"
 msgstr "Csomag"
 
-#: dselect/pkgdisplay.cc:161 dselect/pkgdisplay.cc:165
+#: dselect/pkgdisplay.cc
 #, fuzzy
 #| msgid "Avail.ver"
 msgid "Avail.arch"
 msgstr "Elérh.ver"
 
-#: dselect/pkgdisplay.cc:164
+#: dselect/pkgdisplay.cc
 #, fuzzy
 #| msgid "Inst.ver"
 msgid "Inst.arch"
 msgstr "Telep.ver"
 
-#: dselect/pkgdisplay.cc:178 dselect/pkgdisplay.cc:182
+#: dselect/pkgdisplay.cc
 msgid "Avail.ver"
 msgstr "Elérh.ver"
 
-#: dselect/pkgdisplay.cc:181
+#: dselect/pkgdisplay.cc
 msgid "Inst.ver"
 msgstr "Telep.ver"
 
-#: dselect/pkgdisplay.cc:197
+#: dselect/pkgdisplay.cc
 msgid "dselect - recursive package listing"
 msgstr "dselect - rekurzív csomaglista"
 
-#: dselect/pkgdisplay.cc:199
+#: dselect/pkgdisplay.cc
 msgid "dselect - inspection of package states"
 msgstr "dselect - csomagállapotok vizsgálata"
 
-#: dselect/pkgdisplay.cc:200
+#: dselect/pkgdisplay.cc
 msgid "dselect - main package listing"
 msgstr "dselect - fő csomaglista"
 
-#: dselect/pkgdisplay.cc:208
+#: dselect/pkgdisplay.cc
 msgid " (by section)"
 msgstr " (szakasz szerint)"
 
-#: dselect/pkgdisplay.cc:211
+#: dselect/pkgdisplay.cc
 msgid " (avail., section)"
 msgstr " (elérh., szakasz)"
 
-#: dselect/pkgdisplay.cc:214
+#: dselect/pkgdisplay.cc
 msgid " (status, section)"
 msgstr " (állapot, szakasz)"
 
-#: dselect/pkgdisplay.cc:223
+#: dselect/pkgdisplay.cc
 msgid " (by priority)"
 msgstr " (elsőbbség szerint)"
 
-#: dselect/pkgdisplay.cc:226
+#: dselect/pkgdisplay.cc
 msgid " (avail., priority)"
 msgstr " (elérh., elsőbbség)"
 
-#: dselect/pkgdisplay.cc:229
+#: dselect/pkgdisplay.cc
 msgid " (status, priority)"
 msgstr " (állapot, elsőbbség)"
 
-#: dselect/pkgdisplay.cc:238
+#: dselect/pkgdisplay.cc
 msgid " (alphabetically)"
 msgstr " (abc-ben)"
 
-#: dselect/pkgdisplay.cc:241
+#: dselect/pkgdisplay.cc
 msgid " (by availability)"
 msgstr " (elérhetőség szerint)"
 
-#: dselect/pkgdisplay.cc:244
+#: dselect/pkgdisplay.cc
 msgid " (by status)"
 msgstr " (állapot szerint)"
 
-#: dselect/pkgdisplay.cc:259
+#: dselect/pkgdisplay.cc
 msgid " mark:+/=/- terse:v help:?"
 msgstr " jelölés:+/=/- rövid:v súgó:?"
 
-#: dselect/pkgdisplay.cc:260
+#: dselect/pkgdisplay.cc
 msgid " mark:+/=/- verbose:v help:?"
 msgstr " jelölés:+/=/- hosszú:v súgó:?"
 
-#: dselect/pkgdisplay.cc:262
+#: dselect/pkgdisplay.cc
 msgid " terse:v help:?"
 msgstr " rövid:v súgó:?"
 
-#: dselect/pkgdisplay.cc:263
+#: dselect/pkgdisplay.cc
 msgid " verbose:v help:?"
 msgstr " hosszú:v súgó:?"
 
-#: dselect/pkginfo.cc:85
+#: dselect/pkginfo.cc
 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 "
@@ -1429,85 +1430,111 @@ msgstr ""
 "csomagra látod a lehető legtöbb információt, például a leírását is.\n"
 "Az `o' vagy `O' billentyűvel a rendezést is válthatod."
 
-#: dselect/pkginfo.cc:98
+#: dselect/pkginfo.cc
 msgid "Interrelationships"
 msgstr ""
 
-#: dselect/pkginfo.cc:117
+#: dselect/pkginfo.cc
 #, fuzzy
 msgid "No description available."
 msgstr "nincs róla leírás"
 
-#: dselect/pkginfo.cc:135
+#: dselect/pkginfo.cc
 #, fuzzy
 msgid "Installed control file information"
 msgstr "telepített ellenőrző adatok ehhez:"
 
-#: dselect/pkginfo.cc:151
+#: dselect/pkginfo.cc
 #, fuzzy
 msgid "Available control file information"
 msgstr "ellenőrző fájl elérhető verziója ehhez:"
 
-#: dselect/pkglist.cc:425
+#: dselect/pkglist.cc
 #, fuzzy
 #| msgid "Installed packages"
 msgid "there are no packages"
 msgstr "Telepített csomagok"
 
-#: dselect/pkglist.cc:521
+#: dselect/pkglist.cc
 msgid "invalid search option given"
 msgstr "érvénytelen keresési lehetőség"
 
-#: dselect/pkglist.cc:536
+#: dselect/pkglist.cc
 msgid "error in regular expression"
 msgstr "hiba a szabályos kifejezésben"
 
-#: dselect/pkgsublist.cc:111
+#: dselect/pkgsublist.cc
 msgid " does not appear to be available\n"
 msgstr " nem tűnik elérhetőnek\n"
 
-#: dselect/pkgsublist.cc:131
+#: dselect/pkgsublist.cc
 msgid " or "
 msgstr " vagy"
 
-#: dselect/pkgtop.cc:58
+#: dselect/pkgtop.cc
 msgid "All"
 msgstr "Minden"
 
-#: dselect/pkgtop.cc:80
+#: dselect/pkgtop.cc
 msgid "All packages"
 msgstr "Minden csomag"
 
-#: dselect/pkgtop.cc:84
+#: dselect/pkgtop.cc
 #, c-format
 msgid "%s packages without a section"
 msgstr "%s csomagok melyek nincsenek egy szakaszban"
 
-#: dselect/pkgtop.cc:86
+#: dselect/pkgtop.cc
 #, c-format
 msgid "%s packages in section %s"
 msgstr "%s csomagok az alábbi szakaszban: %s"
 
-#: dselect/pkgtop.cc:92
+#: dselect/pkgtop.cc
 #, c-format
 msgid "%s %s packages"
 msgstr "%s %s csomagok"
 
-#: dselect/pkgtop.cc:96
+#: dselect/pkgtop.cc
 #, c-format
 msgid "%s %s packages without a section"
 msgstr "%s %s csomagok melyek nincsenek egy szakaszban"
 
-#: dselect/pkgtop.cc:98
+#: dselect/pkgtop.cc
 #, c-format
 msgid "%s %s packages in section %s"
 msgstr "%s %s csomagok az alábbi szakaszban: %s"
 
-#: dselect/pkgtop.cc:119
+#: dselect/pkgtop.cc
 #, c-format
 msgid "%-*s %s%s%s;  %s (was: %s).  %s"
 msgstr "%-*s %s%s%s;  %s (volt: %s).  %s"
 
+#, fuzzy
+#~| msgid "Section"
+#~ msgid "Actions:\n"
+#~ msgstr "Szakasz"
+
+#~ msgid "Colours:\n"
+#~ msgstr "Színek:\n"
+
+#~ msgid "Attributes:\n"
+#~ msgstr "Attribútumok:\n"
+
+#~ msgid "!Bug!"
+#~ msgstr "!Hiba! - HIB"
+
+#~ msgid "Updated"
+#~ msgstr "Friss"
+
+#~ msgid "Up-to-date"
+#~ msgstr "Naprakész"
+
+#~ msgid "Updated packages (newer version is available)"
+#~ msgstr "Frissíthető csomagok (újabb változat elérhető)"
+
+#~ msgid "Available packages (not currently installed)"
+#~ msgstr "Elérhető csomagok (most nincsenek telepítve)"
+
 #~ msgid "returned error exit status %d.\n"
 #~ msgstr "a visszaadott hibaérték: %d.\n"
 
diff --git a/dselect/po/id.po b/dselect/po/id.po
index 74c88bd3c..5530639cf 100644
--- a/dselect/po/id.po
+++ b/dselect/po/id.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dselect 1.13\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2014-12-23 18:12+0100\n"
+"POT-Creation-Date: 2015-04-06 09:37+0200\n"
 "PO-Revision-Date: 2006-10-06 20:20+0700\n"
 "Last-Translator: Arief S Fitrianto <arief@gurame.fisika.ui.ac.id>\n"
 "Language-Team: Indonesian <debian-l10n-indonesian@lists.debian.org>\n"
@@ -22,28 +22,28 @@ msgstr ""
 "X-Poedit-Country: INDONESIA\n"
 "X-Poedit-SourceCharset: iso-8859-1\n"
 
-#: dselect/basecmds.cc:125
+#: dselect/basecmds.cc
 msgid "Search for ? "
 msgstr "Cari untuk ?"
 
-#: dselect/basecmds.cc:149
+#: dselect/basecmds.cc
 msgid "Error: "
 msgstr "Kesalahan:"
 
-#: dselect/basecmds.cc:180
+#: dselect/basecmds.cc
 msgid "Help: "
 msgstr "Bantuan:"
 
-#: dselect/basecmds.cc:186
+#: dselect/basecmds.cc
 msgid "Press ? for help menu, . for next topic, <space> to exit help."
 msgstr ""
 "Ketik ? untu menu panduan, . untuk topik selanjutnya, <spasi> untuk keluar."
 
-#: dselect/basecmds.cc:193
+#: dselect/basecmds.cc
 msgid "Help information is available under the following topics:"
 msgstr "Informasi panduan tersedia untuk topik-topik berikut ini:"
 
-#: dselect/basecmds.cc:201
+#: dselect/basecmds.cc
 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. "
@@ -51,243 +51,243 @@ msgstr ""
 "Ketik suatu tombol dari daftar di atas, <spasi> atau `q' untuk keluar,\n"
 "  atau '.' untuk membaca setiap halaman panduan bergantian."
 
-#: dselect/basecmds.cc:207
+#: dselect/basecmds.cc
 msgid "error reading keyboard in help"
 msgstr "ada kesalahan membaca keyboard dalam modus bantuan"
 
-#: dselect/baselist.cc:60
+#: dselect/baselist.cc
 msgid "ioctl(TIOCGWINSZ) failed"
 msgstr "ioctl(TIOCGWINSZ) gagal"
 
-#: dselect/baselist.cc:63
+#: dselect/baselist.cc
 msgid "doupdate in SIGWINCH handler failed"
 msgstr "gagal melakukan 'doupdate' dalam penanganan 'SIGWINCH'"
 
-#: dselect/baselist.cc:72
+#: dselect/baselist.cc
 msgid "failed to restore old SIGWINCH sigact"
 msgstr "gagal mengembalikan 'sigact SIGWINCH' yang lama"
 
-#: dselect/baselist.cc:75
+#: dselect/baselist.cc
 msgid "failed to restore old signal mask"
 msgstr "gagal mengembalikan mask sinyal yang lama"
 
-#: dselect/baselist.cc:86
+#: dselect/baselist.cc
 msgid "failed to get old signal mask"
 msgstr "gagal mendapatkan mask sinyal yang lama"
 
-#: dselect/baselist.cc:88
+#: dselect/baselist.cc
 msgid "failed to get old SIGWINCH sigact"
 msgstr "Gagat mendapatkan 'sigact SIGWINCH' yang lama"
 
-#: dselect/baselist.cc:93
+#: dselect/baselist.cc
 msgid "failed to block SIGWINCH"
 msgstr "gagal melakukan block SIGWINCH"
 
-#: dselect/baselist.cc:99
+#: dselect/baselist.cc
 msgid "failed to set new SIGWINCH sigact"
 msgstr "gagal menyetel 'sigact SIGWINCH'  yang baru"
 
-#: dselect/baselist.cc:174
+#: dselect/baselist.cc
 msgid "failed to allocate colour pair"
 msgstr "gagal mengalokasikan pasangan warna"
 
-#: dselect/baselist.cc:203
+#: dselect/baselist.cc
 msgid "failed to create title window"
 msgstr "gagal membuat judul window"
 
-#: dselect/baselist.cc:207
+#: dselect/baselist.cc
 msgid "failed to create whatinfo window"
 msgstr "gagal membuat window 'whatinfo'"
 
-#: dselect/baselist.cc:211
+#: dselect/baselist.cc
 msgid "failed to create baselist pad"
 msgstr "gagal membuat catatan 'baselist'"
 
-#: dselect/baselist.cc:214
+#: dselect/baselist.cc
 msgid "failed to create heading pad"
 msgstr "gagal membuat catatan 'heading'"
 
-#: dselect/baselist.cc:218
+#: dselect/baselist.cc
 msgid "failed to create thisstate pad"
 msgstr "gagal membuat catatan 'thisstate'"
 
-#: dselect/baselist.cc:222
+#: dselect/baselist.cc
 msgid "failed to create info pad"
 msgstr "gagal membuat catatan 'info'"
 
-#: dselect/baselist.cc:227
+#: dselect/baselist.cc
 msgid "failed to create query window"
 msgstr "gagal membuat window 'query'"
 
-#: dselect/baselist.cc:298
+#: dselect/baselist.cc
 #, fuzzy
 msgid "Keybindings"
 msgstr "relasi tombol"
 
-#: dselect/baselist.cc:347
+#: dselect/baselist.cc
 #, c-format
 msgid "  -- %d%%, press "
 msgstr "  -- %d%%, tekan "
 
-#: dselect/baselist.cc:350
+#: dselect/baselist.cc
 #, c-format
 msgid "%s for more"
 msgstr "%s untuk lanjut "
 
-#: dselect/baselist.cc:354
+#: dselect/baselist.cc
 #, c-format
 msgid "%s to go back"
 msgstr "%s untuk kembali "
 
-#: dselect/bindings.cc:78
+#: dselect/bindings.cc
 msgid "[not bound]"
 msgstr "[tidak direlasikan]"
 
-#: dselect/bindings.cc:82
+#: dselect/bindings.cc
 #, c-format
 msgid "[unk: %d]"
 msgstr "[unk: %d]"
 
-#: dselect/bindings.cc:141
+#: dselect/bindings.cc
 msgid "Scroll onwards through help/information"
 msgstr "Gulunglah layar ke bawah sepanjang informasi/bantuan"
 
-#: dselect/bindings.cc:142
+#: dselect/bindings.cc
 msgid "Scroll backwards through help/information"
 msgstr "Gulunglah layar ke atas sepanjang informasi/bantuan"
 
-#: dselect/bindings.cc:143
+#: dselect/bindings.cc
 msgid "Move up"
 msgstr "Pindah ke atas"
 
-#: dselect/bindings.cc:144
+#: dselect/bindings.cc
 msgid "Move down"
 msgstr "Pindah ke bawah"
 
-#: dselect/bindings.cc:145
+#: dselect/bindings.cc
 msgid "Go to top of list"
 msgstr "Ke awal daftar"
 
-#: dselect/bindings.cc:146
+#: dselect/bindings.cc
 msgid "Go to end of list"
 msgstr "Ke akhir daftar"
 
-#: dselect/bindings.cc:147
+#: dselect/bindings.cc
 msgid "Request help (cycle through help screens)"
 msgstr "Minta panduan (dirotasi sepanjang layar panduan)"
 
-#: dselect/bindings.cc:148
+#: dselect/bindings.cc
 msgid "Cycle through information displays"
 msgstr "Berkelilinglah sepanjang tampilan informasi"
 
-#: dselect/bindings.cc:149
+#: dselect/bindings.cc
 msgid "Redraw display"
 msgstr "Segarkan tampilan"
 
-#: dselect/bindings.cc:150
+#: dselect/bindings.cc
 msgid "Scroll onwards through list by 1 line"
 msgstr "Gulung layar ke bawah sepanjang daftaar tiap satu baris"
 
-#: dselect/bindings.cc:151
+#: dselect/bindings.cc
 msgid "Scroll backwards through list by 1 line"
 msgstr "Gulung layar ke atas sepanjang daftar tiap satu baris"
 
-#: dselect/bindings.cc:152
+#: dselect/bindings.cc
 msgid "Scroll onwards through help/information by 1 line"
 msgstr "Gulung layar ke bawah sepanjang informasi/panduan tiap satu baris"
 
-#: dselect/bindings.cc:153
+#: dselect/bindings.cc
 msgid "Scroll backwards through help/information by 1 line"
 msgstr "Gulung layar ke atas sepanjang informasi/panduan tiap satu baris"
 
-#: dselect/bindings.cc:154
+#: dselect/bindings.cc
 msgid "Scroll onwards through list"
 msgstr "Gulung daftar ke bawah"
 
-#: dselect/bindings.cc:155
+#: dselect/bindings.cc
 msgid "Scroll backwards through list"
 msgstr "Gulung daftar ke atas"
 
-#: dselect/bindings.cc:158
+#: dselect/bindings.cc
 msgid "Mark package(s) for installation"
 msgstr "Tandai paket yang akan dipasang"
 
-#: dselect/bindings.cc:159
+#: dselect/bindings.cc
 msgid "Mark package(s) for deinstallation"
 msgstr "Tandai paket yang akan dibuang"
 
-#: dselect/bindings.cc:160
+#: dselect/bindings.cc
 msgid "Mark package(s) for deinstall and purge"
 msgstr "Tandai paket untuk dibuang dan dimusnahkan"
 
-#: dselect/bindings.cc:161
+#: dselect/bindings.cc
 msgid "Make highlight more specific"
 msgstr "Buat penyorotan lebih spesifik"
 
-#: dselect/bindings.cc:162
+#: dselect/bindings.cc
 msgid "Make highlight less specific"
 msgstr "Buat penyorotan kurang spesifik"
 
-#: dselect/bindings.cc:163
+#: dselect/bindings.cc
 msgid "Search for a package whose name contains a string"
 msgstr "Cari paket yang namanya berisi suatu string"
 
-#: dselect/bindings.cc:164
+#: dselect/bindings.cc
 #, fuzzy
 #| msgid "Repeat last search."
 msgid "Repeat last search"
 msgstr "Ulangi pencarian terakhir"
 
-#: dselect/bindings.cc:165
+#: dselect/bindings.cc
 msgid "Swap sort order priority/section"
 msgstr "Balikkan urutan pengurutan prioritas/bagian"
 
-#: dselect/bindings.cc:166
+#: dselect/bindings.cc
 msgid "Quit, confirming, and checking dependencies"
 msgstr "Keluar, konfirmasi, dan periksa ketergantungan"
 
-#: dselect/bindings.cc:167
+#: dselect/bindings.cc
 msgid "Quit, confirming without check"
 msgstr "Keluar, konfirmasi tanpa pemeriksaan"
 
-#: dselect/bindings.cc:168
+#: dselect/bindings.cc
 msgid "Quit, rejecting conflict/dependency suggestions"
 msgstr "Keluar, tolak saran tentang bentrok/ketergantungan paket"
 
-#: dselect/bindings.cc:169
+#: dselect/bindings.cc
 msgid "Abort - quit without making changes"
 msgstr "Batal - keluar tanpa membuat perubahan"
 
-#: dselect/bindings.cc:170
+#: dselect/bindings.cc
 msgid "Revert to old state for all packages"
 msgstr "Kembalikan semua paket ke keadaan lama"
 
-#: dselect/bindings.cc:171
+#: dselect/bindings.cc
 msgid "Revert to suggested state for all packages"
 msgstr "Kembalikan semua paket ke keadaan yang disarankan"
 
-#: dselect/bindings.cc:172
+#: dselect/bindings.cc
 msgid "Revert to directly requested state for all packages"
 msgstr "Kembalikan semua paket ke keadaan yang diminta langsung"
 
-#: dselect/bindings.cc:173
+#: dselect/bindings.cc
 #, fuzzy
 msgid "Revert to currently installed state for all packages"
 msgstr "Kembalikan semua paket ke keadaan yang diminta langsung"
 
-#: dselect/bindings.cc:176
+#: dselect/bindings.cc
 msgid "Select currently-highlighted access method"
 msgstr "Pilih metode akses yang disorot"
 
-#: dselect/bindings.cc:177
+#: dselect/bindings.cc
 msgid "Quit without changing selected access method"
 msgstr "Keluar tanpa mengubah metode akses yang dipilih"
 
-#: dselect/helpmsgs.cc:29
+#: dselect/helpmsgs.cc
 msgid "Keystrokes"
 msgstr "Tombol singkat"
 
-#: dselect/helpmsgs.cc:29
+#: dselect/helpmsgs.cc
 #, fuzzy
 msgid ""
 "Motion keys: Next/Previous, Top/End, Up/Down, Backwards/Forwards:\n"
@@ -357,11 +357,11 @@ msgstr ""
 "     D          setel semua ke keadaan langsung diminta      n, \\   ulangi "
 "pencarian terakhir\n"
 
-#: dselect/helpmsgs.cc:55
+#: dselect/helpmsgs.cc
 msgid "Introduction to package selections"
 msgstr "Pengantar ke pemilihan paket"
 
-#: dselect/helpmsgs.cc:55
+#: dselect/helpmsgs.cc
 msgid ""
 "Welcome to dselect's main package listing.\n"
 "\n"
@@ -419,11 +419,11 @@ msgstr ""
 "Tekan <enter> untuk meninggalkan panduan sekarang dan masuk ke daftar "
 "paket.\n"
 
-#: dselect/helpmsgs.cc:80
+#: dselect/helpmsgs.cc
 msgid "Introduction to read-only package list browser"
 msgstr "Pengantar ke browser daftar paket hanya-baca"
 
-#: dselect/helpmsgs.cc:80
+#: dselect/helpmsgs.cc
 msgid ""
 "Welcome to dselect's main package listing.\n"
 "\n"
@@ -463,11 +463,11 @@ msgstr ""
 "Tekan <enter> untuk meninggalkan panduan sekarang dan masuk ke daftar "
 "paket.\n"
 
-#: dselect/helpmsgs.cc:99
+#: dselect/helpmsgs.cc
 msgid "Introduction to conflict/dependency resolution sub-list"
 msgstr "Pengantar ke sub-daftar pemecahan masalah bentrok/ketergantungan"
 
-#: dselect/helpmsgs.cc:99
+#: dselect/helpmsgs.cc
 msgid ""
 "Dependency/conflict resolution - introduction.\n"
 "\n"
@@ -539,11 +539,11 @@ msgstr ""
 "tekan `?' \n"
 "untuk melihat panduan.\n"
 
-#: dselect/helpmsgs.cc:125
+#: dselect/helpmsgs.cc
 msgid "Display, part 1: package listing and status chars"
 msgstr "Tampilan, bagian 1: daftar paket dan karakter status"
 
-#: dselect/helpmsgs.cc:125
+#: dselect/helpmsgs.cc
 #, fuzzy
 msgid ""
 "The top half of the screen shows a list of packages.  For each package you "
@@ -609,11 +609,11 @@ msgstr ""
 "terpasang dan yang tersedia (shift-V untuk menampilkan/menyembunyikan) dan \n"
 "keterangan ringkas.\n"
 
-#: dselect/helpmsgs.cc:152
+#: dselect/helpmsgs.cc
 msgid "Display, part 2: list highlight; information display"
 msgstr "Tampilan, bagian 2: penyorotan daftar; tampilan keterangan"
 
-#: dselect/helpmsgs.cc:152
+#: dselect/helpmsgs.cc
 msgid ""
 "* Highlight: One line in the package list will be highlighted.  It "
 "indicates\n"
@@ -670,11 +670,11 @@ msgstr ""
 "  menyembunyikan tampilan informasi atau memperlebarnya hingga memenuhi "
 "layar.\n"
 
-#: dselect/helpmsgs.cc:176
+#: dselect/helpmsgs.cc
 msgid "Introduction to method selection display"
 msgstr "Pengantar ke tampilan pemilihan metode"
 
-#: dselect/helpmsgs.cc:176
+#: dselect/helpmsgs.cc
 msgid ""
 "dselect and dpkg can do automatic installation, loading the package files to "
 "be\n"
@@ -719,11 +719,11 @@ msgstr ""
 "`k' \n"
 "sekarang, atau dari menu panduan dengan menekan tombol `?'.\n"
 
-#: dselect/helpmsgs.cc:196
+#: dselect/helpmsgs.cc
 msgid "Keystrokes for method selection"
 msgstr "tombol singkat untuk pemilihan metode"
 
-#: dselect/helpmsgs.cc:196
+#: dselect/helpmsgs.cc
 #, fuzzy
 msgid ""
 "Motion keys: Next/Previous, Top/End, Up/Down, Backwards/Forwards:\n"
@@ -776,104 +776,104 @@ msgstr ""
 "   /               cari (cukup tekan enter untuk membatalkan)\n"
 "  \\               ulangi pencarian terakhir\n"
 
-#: dselect/main.cc:63
+#: dselect/main.cc
 msgid "Type dselect --help for help."
 msgstr "ketik 'dselect --help' untuk bantuan."
 
-#: dselect/main.cc:145
+#: dselect/main.cc
 msgid "a"
 msgstr "a"
 
-#: dselect/main.cc:145
+#: dselect/main.cc
 msgid "[A]ccess"
 msgstr "[A]Akses"
 
-#: dselect/main.cc:145
+#: dselect/main.cc
 msgid "Choose the access method to use."
 msgstr "Pilih metode akses yang ingin digunakan."
 
-#: dselect/main.cc:146
+#: dselect/main.cc
 msgid "u"
 msgstr "p"
 
-#: dselect/main.cc:146
+#: dselect/main.cc
 msgid "[U]pdate"
 msgstr "[U]Perbaru"
 
-#: dselect/main.cc:146
+#: dselect/main.cc
 msgid "Update list of available packages, if possible."
 msgstr "Perbaharui daftar paket yang tersedia bila memungkinkan."
 
-#: dselect/main.cc:147
+#: dselect/main.cc
 msgid "s"
 msgstr "s"
 
-#: dselect/main.cc:147
+#: dselect/main.cc
 msgid "[S]elect"
 msgstr "[S]Pilih"
 
-#: dselect/main.cc:147
+#: dselect/main.cc
 msgid "Request which packages you want on your system."
 msgstr "Pilihlah paket yang ingin Anda pasang pada sistem."
 
-#: dselect/main.cc:148
+#: dselect/main.cc
 msgid "i"
 msgstr "p"
 
-#: dselect/main.cc:148
+#: dselect/main.cc
 msgid "[I]nstall"
 msgstr "[I]Pasang"
 
-#: dselect/main.cc:148
+#: dselect/main.cc
 msgid "Install and upgrade wanted packages."
 msgstr "Pasang dan perbaharui paket-paket yang diinginkan."
 
-#: dselect/main.cc:149
+#: dselect/main.cc
 msgid "c"
 msgstr "c"
 
-#: dselect/main.cc:149
+#: dselect/main.cc
 msgid "[C]onfig"
 msgstr "[C]Konfigurasi"
 
-#: dselect/main.cc:149
+#: dselect/main.cc
 msgid "Configure any packages that are unconfigured."
 msgstr "Konfigurasi semua paket yang belum dikonfigurasi."
 
-#: dselect/main.cc:150
+#: dselect/main.cc
 msgid "r"
 msgstr "b"
 
-#: dselect/main.cc:150
+#: dselect/main.cc
 msgid "[R]emove"
 msgstr "[R]Buang"
 
-#: dselect/main.cc:150
+#: dselect/main.cc
 msgid "Remove unwanted software."
 msgstr "Buang perangkat lunak yang tak diinginkan."
 
-#: dselect/main.cc:151
+#: dselect/main.cc
 msgid "q"
 msgstr "q"
 
-#: dselect/main.cc:151
+#: dselect/main.cc
 msgid "[Q]uit"
 msgstr "[Q]Keluar"
 
-#: dselect/main.cc:151
+#: dselect/main.cc
 msgid "Quit dselect."
 msgstr "keluar dari dselect."
 
-#: dselect/main.cc:152
+#: dselect/main.cc
 msgid "menu"
 msgstr "menu"
 
-#: dselect/main.cc:157
+#: dselect/main.cc
 #, c-format
 msgid "Debian `%s' package handling frontend version %s.\n"
 msgstr "Antarmuka penanganan paket Debian '%s' versi %s.\n"
 
-#: dselect/main.cc:160
+#: dselect/main.cc
 #, fuzzy
 msgid ""
 "This is free software; see the GNU General Public License version 2 or\n"
@@ -884,20 +884,28 @@ msgstr ""
 "selanjutnya untuk persyaratan penggandaan. TIDAK ADA jaminan. \n"
 "Lihat %s --license keterangan hak cipta dan rincian lisensi.\n"
 
-#: dselect/main.cc:169 dselect/main.cc:217
+#: dselect/main.cc
 msgid "<standard output>"
 msgstr ""
 
-#: dselect/main.cc:180
-#, c-format
+#: dselect/main.cc
+#, fuzzy, c-format
+#| msgid ""
+#| "Usage: %s [<option> ...] [<action> ...]\n"
+#| "\n"
 msgid ""
-"Usage: %s [<option> ...] [<action> ...]\n"
+"Usage: %s [<option>...] [<command>...]\n"
 "\n"
 msgstr ""
 "Penggunaan: %s [<pilihan> ...] [<aksi> ...]\n"
 "\n"
 
-#: dselect/main.cc:184
+#: dselect/main.cc
+#, c-format
+msgid "Commands:\n"
+msgstr ""
+
+#: dselect/main.cc
 #, fuzzy, c-format
 #| msgid ""
 #| "Options:\n"
@@ -911,12 +919,12 @@ msgstr ""
 #| "\n"
 msgid ""
 "Options:\n"
-"  --admindir <directory>     Use <directory> instead of %s.\n"
-"  --expert                   Turn on expert mode.\n"
-"  --debug <file> | -D<file>  Turn on debugging, sending output to <file>.\n"
-"  --colour | --color screenpart:[foreground],[background][:attr[+attr+...]]\n"
-"                             Configure screen colours.\n"
-"\n"
+"      --admindir <directory>       Use <directory> instead of %s.\n"
+"      --expert                     Turn on expert mode.\n"
+"  -D, --debug <file>               Turn on debugging, send output to "
+"<file>.\n"
+"      --color <color-spec>         Configure screen colors.\n"
+"      --colour <color-spec>        Ditto.\n"
 msgstr ""
 "Pilihan:\n"
 "  --admindir <direktori>     Gunakan <direktori> dan bukannya %s. \n"
@@ -928,11 +936,11 @@ msgstr ""
 "                              Konfigurasi warna layar.\n"
 "\n"
 
-#: dselect/main.cc:193
+#: dselect/main.cc
 #, fuzzy, c-format
 msgid ""
-"  --help                     Show this help message.\n"
-"  --version                  Show the version.\n"
+"  -?, --help                       Show this help message.\n"
+"      --version                    Show the version.\n"
 "\n"
 msgstr ""
 "  --help                    Tampilkan pesan bantuan ini.\n"
@@ -940,65 +948,67 @@ msgstr ""
 "  --license | --licence          Tampilkan lisensi program.\n"
 "\n"
 
-#: dselect/main.cc:197
-#, fuzzy, c-format
-#| msgid "Section"
-msgid "Actions:\n"
-msgstr "Bagian"
-
-#: dselect/main.cc:202
+#: dselect/main.cc
 #, c-format
-msgid "Screenparts:\n"
+msgid ""
+"<color-spec> is <screen-part>:[<foreground>],[<background>][:"
+"<attr>[+<attr>]...]\n"
+msgstr ""
+
+#: dselect/main.cc
+#, fuzzy, c-format
+#| msgid "Screenparts:\n"
+msgid "<screen-part> is:"
 msgstr "Bagian Layar: \n"
 
-#: dselect/main.cc:207
+#: dselect/main.cc
 #, c-format
-msgid "Colours:\n"
-msgstr "Warna: \n"
+msgid "<color> is:"
+msgstr ""
 
-#: dselect/main.cc:212
+#: dselect/main.cc
 #, c-format
-msgid "Attributes:\n"
-msgstr "Atribut: \n"
+msgid "<attr> is:"
+msgstr ""
 
-#: dselect/main.cc:232
+#: dselect/main.cc
 #, c-format
 msgid "couldn't open debug file `%.255s'\n"
 msgstr "tidak dapat membuka berkas debug `%.250s'\n"
 
-#: dselect/main.cc:253
+#: dselect/main.cc
 #, fuzzy, c-format
 #| msgid "Invalid %s `%s'\n"
 msgid "invalid %s '%s'"
 msgstr "%s `%s' tidak sah\n"
 
-#: dselect/main.cc:272
+#: dselect/main.cc
 msgid "screen part"
 msgstr "bagian layar"
 
-#: dselect/main.cc:278
+#: dselect/main.cc
 #, fuzzy
 #| msgid "Null colour specification\n"
 msgid "null colour specification"
 msgstr "tidak ada spesifikasi warna\n"
 
-#: dselect/main.cc:286 dselect/main.cc:291
+#: dselect/main.cc
 msgid "colour"
 msgstr "warna"
 
-#: dselect/main.cc:299
+#: dselect/main.cc
 msgid "colour attribute"
 msgstr "atribut warna"
 
-#: dselect/main.cc:333
+#: dselect/main.cc
 msgid "Terminal does not appear to support cursor addressing.\n"
 msgstr "Terminal tampaknya tidak mendukung pengalamatan cursor.\n"
 
-#: dselect/main.cc:335
+#: dselect/main.cc
 msgid "Terminal does not appear to support highlighting.\n"
 msgstr "Terminal tampaknya tidak mendukung penyorotan.\n"
 
-#: dselect/main.cc:337
+#: dselect/main.cc
 #, c-format
 msgid ""
 "Set your TERM variable correctly, use a better terminal,\n"
@@ -1007,11 +1017,11 @@ msgstr ""
 "Setel variabel TERM Anda dengan benar, gunakan terminal yang lebih baik,\n"
 "atau lakukanlah dengan sarana pengelolaan per-paket %s.\n"
 
-#: dselect/main.cc:340
+#: dselect/main.cc
 msgid "terminal lacks necessary features, giving up"
 msgstr "terminal tak memiliki fitur yang diperlukan, menyerah"
 
-#: dselect/main.cc:425
+#: dselect/main.cc
 msgid ""
 "\n"
 "\n"
@@ -1025,7 +1035,7 @@ msgstr ""
 "Tekan <enter> untuk konfirmasi pilihan. ^L untuk menampil ulang layar.\n"
 "\n"
 
-#: dselect/main.cc:430
+#: dselect/main.cc
 msgid ""
 "Copyright (C) 1994-1996 Ian Jackson.\n"
 "Copyright (C) 2000,2001 Wichert Akkerman.\n"
@@ -1033,7 +1043,7 @@ msgstr ""
 "Hak Cipta (C)  1994-1996 Ian Jackson.\n"
 "Hak CIpta (C) 2000,2001 Wichert Akkerman.\n"
 
-#: dselect/main.cc:436
+#: dselect/main.cc
 msgid ""
 "\n"
 "\n"
@@ -1043,58 +1053,58 @@ msgstr ""
 "\n"
 "Akses hanya-baca: hanya pratilik pilihan yang tersedia!"
 
-#: dselect/main.cc:455
+#: dselect/main.cc
 msgid "failed to getch in main menu"
 msgstr "gagal melakukan 'getch' dalam menu utama"
 
-#: dselect/main.cc:538
+#: dselect/main.cc
 #, c-format
 msgid "unknown action string `%.50s'"
 msgstr "string aksi `%.50s' tidak dikenal"
 
-#: dselect/methlist.cc:66
+#: dselect/methlist.cc
 msgid "Abbrev."
 msgstr "Singkatan"
 
-#: dselect/methlist.cc:67 dselect/pkgdisplay.cc:188 dselect/pkginfo.cc:110
+#: dselect/methlist.cc dselect/pkgdisplay.cc dselect/pkginfo.cc
 msgid "Description"
 msgstr "Keterangan"
 
-#: dselect/methlist.cc:73
+#: dselect/methlist.cc
 msgid "dselect - list of access methods"
 msgstr "dselect - daftar metode akses"
 
-#: dselect/methlist.cc:82
+#: dselect/methlist.cc
 #, c-format
 msgid "Access method `%s'."
 msgstr "Metode akses `%s'"
 
-#: dselect/methlist.cc:161 dselect/pkglist.cc:587
+#: dselect/methlist.cc dselect/pkglist.cc
 msgid "doupdate failed"
 msgstr "doupdate gagal"
 
-#: dselect/methlist.cc:164 dselect/pkglist.cc:590
+#: dselect/methlist.cc dselect/pkglist.cc
 msgid "failed to unblock SIGWINCH"
 msgstr "gagal melakukan 'unblock' SIGWINCH"
 
-#: dselect/methlist.cc:169 dselect/pkglist.cc:595
+#: dselect/methlist.cc dselect/pkglist.cc
 msgid "failed to re-block SIGWINCH"
 msgstr "gagal melakukan 're-block' SIGWINCH"
 
-#: dselect/methlist.cc:170 dselect/pkglist.cc:597
+#: dselect/methlist.cc dselect/pkglist.cc
 msgid "getch failed"
 msgstr "getch gagal"
 
-#: dselect/methlist.cc:187
+#: dselect/methlist.cc
 #, fuzzy
 msgid "Explanation"
 msgstr "penjelasan dari"
 
-#: dselect/methlist.cc:197
+#: dselect/methlist.cc
 msgid "No explanation available."
 msgstr "Tidak ada penjelasan tersedia."
 
-#: dselect/method.cc:67
+#: dselect/method.cc
 #, c-format
 msgid ""
 "\n"
@@ -1105,7 +1115,7 @@ msgstr ""
 "\n"
 "%s: %s\n"
 
-#: dselect/method.cc:70
+#: dselect/method.cc
 msgid ""
 "\n"
 "Press <enter> to continue."
@@ -1113,192 +1123,202 @@ msgstr ""
 "\n"
 "Tekan <enter> untuk meneruskan."
 
-#: dselect/method.cc:82
+#: dselect/method.cc
 msgid "cannot unlock access method area"
 msgstr ""
 
-#: dselect/method.cc:96
+#: dselect/method.cc
 #, fuzzy
 #| msgid " does not appear to be available\n"
 msgid "no access methods are available"
 msgstr " tampaknya tidak tersedia\n"
 
-#: dselect/method.cc:115
+#: dselect/method.cc
 msgid "requested operation requires superuser privilege"
 msgstr ""
 
-#: dselect/method.cc:118
+#: dselect/method.cc
 #, fuzzy
 #| msgid "Choose the access method to use."
 msgid "cannot open or create access method lockfile"
 msgstr "Pilih metode akses yang ingin digunakan."
 
-#: dselect/method.cc:125
+#: dselect/method.cc
 msgid "the access method area is already locked"
 msgstr ""
 
-#: dselect/method.cc:128
+#: dselect/method.cc
 #, fuzzy
 #| msgid "dselect - list of access methods"
 msgid "cannot lock access method area"
 msgstr "dselect - daftar metode akses"
 
-#: dselect/method.cc:161
+#: dselect/method.cc
 #, c-format
 msgid "Press <enter> to continue.\n"
 msgstr "Tekan <enter>  untuk meneruskan.\n"
 
-#: dselect/method.cc:162
+#: dselect/method.cc
 #, fuzzy
 msgid "<standard error>"
 msgstr "Ada kesalahan menulis pada 'standar error'"
 
-#: dselect/method.cc:165
+#: dselect/method.cc
 msgid "error reading acknowledgement of program failure message"
 msgstr "gagal  membaca pemberitahuan dari pesan kegagalan program"
 
-#: dselect/method.cc:187
+#: dselect/method.cc
 msgid "no access method is selected or configured"
 msgstr ""
 
-#: dselect/method.cc:196
+#: dselect/method.cc
 msgid "update available list script"
 msgstr "perbaharui script daftar yang tersedia"
 
-#: dselect/method.cc:200
+#: dselect/method.cc
 msgid "installation script"
 msgstr "skrip pemasangan"
 
-#: dselect/method.cc:246
+#: dselect/method.cc
 msgid "query/setup script"
 msgstr "script query/setup"
 
-#: dselect/methparse.cc:53
+#: dselect/methparse.cc
 #, c-format
 msgid "syntax error in method options file `%.250s' -- %s"
 msgstr "ada kesalahan sintaks dalam berkas pilihan metode `%.250s' -- %s"
 
-#: dselect/methparse.cc:59
+#: dselect/methparse.cc
 #, c-format
 msgid "error reading options file `%.250s'"
 msgstr "ada kesalahan saat membaca berkas pilihan `%.250s'"
 
-#: dselect/methparse.cc:93
+#: dselect/methparse.cc
 #, c-format
 msgid "unable to read `%.250s' directory for reading methods"
 msgstr "tidak bisa membaca direktori `%.250s' untuk membaca metode"
 
-#: dselect/methparse.cc:109
+#: dselect/methparse.cc
 #, c-format
 msgid "method `%.250s' has name that is too long (%d > %d characters)"
 msgstr "metode `%.250s' memiliki nama terlalu panjang (%d > %d karakter)"
 
-#: dselect/methparse.cc:120
+#: dselect/methparse.cc
 #, c-format
 msgid "unable to access method script `%.250s'"
 msgstr "tidak bisa mengakses berkas skrip metode `%.250s'"
 
-#: dselect/methparse.cc:126
+#: dselect/methparse.cc
 #, c-format
 msgid "unable to read method options file `%.250s'"
 msgstr "tidak bisa membaca berkas pilihan metode `%.250s'"
 
-#: dselect/methparse.cc:150
+#: dselect/methparse.cc
 msgid "non-digit where digit wanted"
 msgstr "bukan digit di tempat yang harusnya digit"
 
-#: dselect/methparse.cc:153
-msgid "EOF in index string"
+#: dselect/methparse.cc
+#, fuzzy
+#| msgid "EOF in index string"
+msgid "end of file in index string"
 msgstr "Ada EOF dalam string indeks"
 
-#: dselect/methparse.cc:156
+#: dselect/methparse.cc
 msgid "index string too long"
 msgstr "indeks string terlalu panjang"
 
-#: dselect/methparse.cc:159
+#: dselect/methparse.cc
 msgid "newline before option name start"
 msgstr "ada baris-baru sebelum awal nama pilihan"
 
-#: dselect/methparse.cc:161
-msgid "EOF before option name start"
-msgstr "Ada EOF sebelum awal nama pilihan"
+#: dselect/methparse.cc
+#, fuzzy
+#| msgid "newline before option name start"
+msgid "end of file before option name start"
+msgstr "ada baris-baru sebelum awal nama pilihan"
 
-#: dselect/methparse.cc:165
+#: dselect/methparse.cc
 msgid "nonalpha where option name start wanted"
 msgstr "bukan-alfa di tempat awal nama pilihan "
 
-#: dselect/methparse.cc:167
+#: dselect/methparse.cc
 msgid "non-alphanum in option name"
 msgstr "bukan alfanumerik dalam nama pilihan"
 
-#: dselect/methparse.cc:170
-msgid "EOF in option name"
+#: dselect/methparse.cc
+#, fuzzy
+#| msgid "EOF in option name"
+msgid "end of file in option name"
 msgstr "Ada EOF dalam nama pilihan"
 
-#: dselect/methparse.cc:175
+#: dselect/methparse.cc
 msgid "newline before summary"
 msgstr "ada baris-baru sebelum ikhtisar"
 
-#: dselect/methparse.cc:177
-msgid "EOF before summary"
-msgstr "Ada EOF sebelum ikhstisar"
+#: dselect/methparse.cc
+#, fuzzy
+#| msgid "newline before summary"
+msgid "end of file before summary"
+msgstr "ada baris-baru sebelum ikhtisar"
 
-#: dselect/methparse.cc:183
-msgid "EOF in summary - missing newline"
+#: dselect/methparse.cc
+#, fuzzy
+#| msgid "EOF in summary - missing newline"
+msgid "end of file in summary - missing newline"
 msgstr "Ada EOF dalam ikhtisar - baris-baru hilang"
 
-#: dselect/methparse.cc:193
+#: dselect/methparse.cc
 #, c-format
 msgid "unable to open option description file `%.250s'"
 msgstr "tidak bisa membuka berkas penjelasan pilihan `%.250s'"
 
-#: dselect/methparse.cc:197
+#: dselect/methparse.cc
 #, c-format
 msgid "unable to stat option description file `%.250s'"
 msgstr "tidak bisa melakukan 'stat' pada berkas penjelasan pilihan `%.250s'"
 
-#: dselect/methparse.cc:201
+#: dselect/methparse.cc
 #, c-format
 msgid "failed to read option description file `%.250s'"
 msgstr "gagal membaca berkas penjelasan pilihan `%.250s'"
 
-#: dselect/methparse.cc:204
+#: dselect/methparse.cc
 #, c-format
 msgid "error during read of option description file `%.250s'"
 msgstr "ada kesalahan selama membaca berkas penjelasan pilihan `%.250s'"
 
-#: dselect/methparse.cc:227
+#: dselect/methparse.cc
 #, c-format
 msgid "error during read of method options file `%.250s'"
 msgstr "ada kesalahan selama membaca berkas pilihan metode `%.250s'"
 
-#: dselect/methparse.cc:250
+#: dselect/methparse.cc
 #, c-format
 msgid "unable to open current option file `%.250s'"
 msgstr "tidak bisa membuka berkas pilihan saat ini `%.250s'"
 
-#: dselect/methparse.cc:286
+#: dselect/methparse.cc
 #, c-format
 msgid "unable to write new option to `%.250s'"
 msgstr "tidak bisa menulis pilihan baru ke `%.250s'"
 
-#: dselect/pkgdisplay.cc:36
+#: dselect/pkgdisplay.cc
 msgid "new package"
 msgstr "paket baru"
 
-#: dselect/pkgdisplay.cc:37
+#: dselect/pkgdisplay.cc
 msgid "install"
 msgstr "pasang"
 
-#: dselect/pkgdisplay.cc:38
+#: dselect/pkgdisplay.cc
 msgid "hold"
 msgstr "tahan"
 
-#: dselect/pkgdisplay.cc:39
+#: dselect/pkgdisplay.cc
 msgid "remove"
 msgstr "buang"
 
-#: dselect/pkgdisplay.cc:40
+#: dselect/pkgdisplay.cc
 msgid "purge"
 msgstr "musnahkan"
 
@@ -1306,331 +1326,325 @@ msgstr "musnahkan"
 #. * the empty string to store information about the translation. DO NOT
 #. * CHANGE THAT IN A TRANSLATION! The code really relies on that being
 #. * a single space.
-#: dselect/pkgdisplay.cc:47
+#: dselect/pkgdisplay.cc
 msgid " "
 msgstr " "
 
-#: dselect/pkgdisplay.cc:48
+#: dselect/pkgdisplay.cc
 msgid "REINSTALL"
 msgstr "PASANG-ULANG"
 
-#: dselect/pkgdisplay.cc:51
+#: dselect/pkgdisplay.cc
 msgid "not installed"
 msgstr "tak dipasang"
 
-#: dselect/pkgdisplay.cc:52
+#: dselect/pkgdisplay.cc
 msgid "removed (configs remain)"
 msgstr "buang (konfigurasinya jangan)"
 
-#: dselect/pkgdisplay.cc:53
+#: dselect/pkgdisplay.cc
 msgid "half installed"
 msgstr "setengah terpasang"
 
-#: dselect/pkgdisplay.cc:54
+#: dselect/pkgdisplay.cc
 msgid "unpacked (not set up)"
 msgstr "telah dibuka (belum disetel)"
 
-#: dselect/pkgdisplay.cc:55
+#: dselect/pkgdisplay.cc
 msgid "half configured (config failed)"
 msgstr ""
 
-#: dselect/pkgdisplay.cc:56
+#: dselect/pkgdisplay.cc
 msgid "awaiting trigger processing"
 msgstr ""
 
-#: dselect/pkgdisplay.cc:57
+#: dselect/pkgdisplay.cc
 msgid "triggered"
 msgstr ""
 
-#: dselect/pkgdisplay.cc:58
+#: dselect/pkgdisplay.cc
 msgid "installed"
 msgstr "terpasang"
 
-#: dselect/pkgdisplay.cc:61
+#: dselect/pkgdisplay.cc
 msgid "Required"
 msgstr "Diperlukan"
 
-#: dselect/pkgdisplay.cc:62
+#: dselect/pkgdisplay.cc
 msgid "Important"
 msgstr "Penting"
 
-#: dselect/pkgdisplay.cc:63
+#: dselect/pkgdisplay.cc
 msgid "Standard"
 msgstr "Standar"
 
-#: dselect/pkgdisplay.cc:64
+#: dselect/pkgdisplay.cc
 msgid "Optional"
 msgstr "Pilihan"
 
-#: dselect/pkgdisplay.cc:65
+#: dselect/pkgdisplay.cc
 msgid "Extra"
 msgstr "Tambahan"
 
-#: dselect/pkgdisplay.cc:66
-msgid "!Bug!"
-msgstr "!Cacat!"
-
-#: dselect/pkgdisplay.cc:67
+#: dselect/pkgdisplay.cc
 msgid "Unclassified"
 msgstr "Tak dikelompokkan"
 
-#: dselect/pkgdisplay.cc:70
+#: dselect/pkgdisplay.cc
 msgid "suggests"
 msgstr "disarankan"
 
-#: dselect/pkgdisplay.cc:71
+#: dselect/pkgdisplay.cc
 msgid "recommends"
 msgstr "dianjurkan"
 
-#: dselect/pkgdisplay.cc:72
+#: dselect/pkgdisplay.cc
 msgid "depends on"
 msgstr "bergantung pada"
 
-#: dselect/pkgdisplay.cc:73
+#: dselect/pkgdisplay.cc
 msgid "pre-depends on"
 msgstr "pra-syarat awal"
 
-#: dselect/pkgdisplay.cc:74
+#: dselect/pkgdisplay.cc
 msgid "breaks"
 msgstr ""
 
-#: dselect/pkgdisplay.cc:75
+#: dselect/pkgdisplay.cc
 msgid "conflicts with"
 msgstr "bentrok dengan"
 
-#: dselect/pkgdisplay.cc:76
+#: dselect/pkgdisplay.cc
 msgid "provides"
 msgstr "menyediakan"
 
-#: dselect/pkgdisplay.cc:77
+#: dselect/pkgdisplay.cc
 msgid "replaces"
 msgstr "menggantikan"
 
-#: dselect/pkgdisplay.cc:78
+#: dselect/pkgdisplay.cc
 msgid "enhances"
 msgstr "disempurnakan"
 
-#: dselect/pkgdisplay.cc:81
+#: dselect/pkgdisplay.cc
 msgid "Req"
 msgstr "Bth"
 
-#: dselect/pkgdisplay.cc:82
+#: dselect/pkgdisplay.cc
 msgid "Imp"
 msgstr "Ptg"
 
-#: dselect/pkgdisplay.cc:83
+#: dselect/pkgdisplay.cc
 msgid "Std"
 msgstr "Std"
 
-#: dselect/pkgdisplay.cc:84
+#: dselect/pkgdisplay.cc
 msgid "Opt"
 msgstr "Plh"
 
-#: dselect/pkgdisplay.cc:85
+#: dselect/pkgdisplay.cc
 msgid "Xtr"
 msgstr "Tbh"
 
-#: dselect/pkgdisplay.cc:86
+#: dselect/pkgdisplay.cc
 msgid "bUG"
 msgstr "CACAT"
 
-#: dselect/pkgdisplay.cc:87
+#: dselect/pkgdisplay.cc
 msgid "?"
 msgstr "?"
 
-#: dselect/pkgdisplay.cc:95 dselect/pkgdisplay.cc:115
+#: dselect/pkgdisplay.cc
 msgid "Broken"
 msgstr "Rusak"
 
-#: dselect/pkgdisplay.cc:96
+#: dselect/pkgdisplay.cc
 msgid "New"
 msgstr "Baru"
 
-#: dselect/pkgdisplay.cc:97
-msgid "Updated"
-msgstr "Diperbaharui"
+#: dselect/pkgdisplay.cc
+msgid "Upgradable"
+msgstr ""
 
-#: dselect/pkgdisplay.cc:98
+#: dselect/pkgdisplay.cc
 msgid "Obsolete/local"
 msgstr "Usang/lokal"
 
-#: dselect/pkgdisplay.cc:99
-msgid "Up-to-date"
-msgstr "Masih baru"
+#: dselect/pkgdisplay.cc
+msgid "Installed"
+msgstr "Terpasang"
 
-#: dselect/pkgdisplay.cc:100
+#: dselect/pkgdisplay.cc
 msgid "Available"
 msgstr "Tersedia"
 
-#: dselect/pkgdisplay.cc:101 dselect/pkgdisplay.cc:117
+#: dselect/pkgdisplay.cc
 msgid "Removed"
 msgstr "Dibuang"
 
-#: dselect/pkgdisplay.cc:102 dselect/pkgdisplay.cc:111
+#: dselect/pkgdisplay.cc
 msgid "Brokenly installed packages"
 msgstr "Paket terpasang yang rusak"
 
-#: dselect/pkgdisplay.cc:103
+#: dselect/pkgdisplay.cc
 msgid "Newly available packages"
 msgstr "Paket baru yang tersedia"
 
-#: dselect/pkgdisplay.cc:104
-msgid "Updated packages (newer version is available)"
-msgstr "Paket-paket terbaru (versi terbaru tersedia)"
+#: dselect/pkgdisplay.cc
+#, fuzzy
+#| msgid "Newly available packages"
+msgid "Upgradable packages"
+msgstr "Paket baru yang tersedia"
 
-#: dselect/pkgdisplay.cc:105
-msgid "Obsolete and local packages present on system"
+#: dselect/pkgdisplay.cc
+#, fuzzy
+#| msgid "Obsolete and local packages present on system"
+msgid "Obsolete and locally created packages"
 msgstr "Paket-paket lokal dan usang ada pada sistem"
 
-#: dselect/pkgdisplay.cc:106
-msgid "Up to date installed packages"
-msgstr "Paket-paket terpasang yang terkini"
+#: dselect/pkgdisplay.cc
+msgid "Installed packages"
+msgstr "Paket-paket yang terpasang"
 
-#: dselect/pkgdisplay.cc:107
-msgid "Available packages (not currently installed)"
-msgstr "Paket-paket yagn tersedia (belum terpasang)"
+#: dselect/pkgdisplay.cc
+#, fuzzy
+#| msgid "Up to date installed packages"
+msgid "Available not installed packages"
+msgstr "Paket-paket terpasang yang terkini"
 
-#: dselect/pkgdisplay.cc:108
+#: dselect/pkgdisplay.cc
 msgid "Removed and no longer available packages"
 msgstr "Paket-paket terbuang dan tak lagi tersedia"
 
-#: dselect/pkgdisplay.cc:112
-msgid "Installed packages"
-msgstr "Paket-paket yang terpasang"
-
-#: dselect/pkgdisplay.cc:113
+#: dselect/pkgdisplay.cc
 msgid "Removed packages (configuration still present)"
 msgstr "Paket-paket yang dibuang (konfigurasi masih ada)"
 
-#: dselect/pkgdisplay.cc:114
+#: dselect/pkgdisplay.cc
 msgid "Purged packages and those never installed"
 msgstr "Paket-paket yang dimusnahkan dan yang belum pernah terpasang"
 
-#: dselect/pkgdisplay.cc:116
-msgid "Installed"
-msgstr "Terpasang"
-
-#: dselect/pkgdisplay.cc:118
+#: dselect/pkgdisplay.cc
 msgid "Purged"
 msgstr "Musnah"
 
-#: dselect/pkgdisplay.cc:138
+#: dselect/pkgdisplay.cc
 msgid "Error"
 msgstr "Ada Kesalahan"
 
-#: dselect/pkgdisplay.cc:139
+#: dselect/pkgdisplay.cc
 msgid "Installed?"
 msgstr "Terpasang?"
 
-#: dselect/pkgdisplay.cc:140
+#: dselect/pkgdisplay.cc
 msgid "Old mark"
 msgstr "Tanda lama"
 
-#: dselect/pkgdisplay.cc:141
+#: dselect/pkgdisplay.cc
 msgid "Marked for"
 msgstr "Ditandai untuk"
 
-#: dselect/pkgdisplay.cc:143
+#: dselect/pkgdisplay.cc
 msgid "EIOM"
 msgstr "EPOT"
 
-#: dselect/pkgdisplay.cc:147 dselect/pkgdisplay.cc:150
+#: dselect/pkgdisplay.cc
 msgid "Section"
 msgstr "Bagian"
 
-#: dselect/pkgdisplay.cc:148
+#: dselect/pkgdisplay.cc
 msgid "Priority"
 msgstr "Prioritas"
 
-#: dselect/pkgdisplay.cc:152
+#: dselect/pkgdisplay.cc
 msgid "Package"
 msgstr "Paket"
 
-#: dselect/pkgdisplay.cc:161 dselect/pkgdisplay.cc:165
+#: dselect/pkgdisplay.cc
 #, fuzzy
 #| msgid "Avail.ver"
 msgid "Avail.arch"
 msgstr "Ver. t'sedia"
 
-#: dselect/pkgdisplay.cc:164
+#: dselect/pkgdisplay.cc
 #, fuzzy
 #| msgid "Inst.ver"
 msgid "Inst.arch"
 msgstr "Ver. terpsg"
 
-#: dselect/pkgdisplay.cc:178 dselect/pkgdisplay.cc:182
+#: dselect/pkgdisplay.cc
 msgid "Avail.ver"
 msgstr "Ver. t'sedia"
 
-#: dselect/pkgdisplay.cc:181
+#: dselect/pkgdisplay.cc
 msgid "Inst.ver"
 msgstr "Ver. terpsg"
 
-#: dselect/pkgdisplay.cc:197
+#: dselect/pkgdisplay.cc
 msgid "dselect - recursive package listing"
 msgstr "dselect - daftar paket terinci"
 
-#: dselect/pkgdisplay.cc:199
+#: dselect/pkgdisplay.cc
 msgid "dselect - inspection of package states"
 msgstr "dselect - peninjauan keadaan paket"
 
-#: dselect/pkgdisplay.cc:200
+#: dselect/pkgdisplay.cc
 msgid "dselect - main package listing"
 msgstr "dselect - daftar paket utama"
 
-#: dselect/pkgdisplay.cc:208
+#: dselect/pkgdisplay.cc
 msgid " (by section)"
 msgstr " (berdasarkan bagian)"
 
-#: dselect/pkgdisplay.cc:211
+#: dselect/pkgdisplay.cc
 msgid " (avail., section)"
 msgstr " (tersedia, bag.)"
 
-#: dselect/pkgdisplay.cc:214
+#: dselect/pkgdisplay.cc
 msgid " (status, section)"
 msgstr " (status, bag.)"
 
-#: dselect/pkgdisplay.cc:223
+#: dselect/pkgdisplay.cc
 msgid " (by priority)"
 msgstr " (berdasarkan prioritas)"
 
-#: dselect/pkgdisplay.cc:226
+#: dselect/pkgdisplay.cc
 msgid " (avail., priority)"
 msgstr " (tersedia, prioritas)"
 
-#: dselect/pkgdisplay.cc:229
+#: dselect/pkgdisplay.cc
 msgid " (status, priority)"
 msgstr " (status,prioritas)"
 
-#: dselect/pkgdisplay.cc:238
+#: dselect/pkgdisplay.cc
 msgid " (alphabetically)"
 msgstr "  (secara alfabet)"
 
-#: dselect/pkgdisplay.cc:241
+#: dselect/pkgdisplay.cc
 msgid " (by availability)"
 msgstr " (berdasarkan ketersediaan)"
 
-#: dselect/pkgdisplay.cc:244
+#: dselect/pkgdisplay.cc
 msgid " (by status)"
 msgstr " (berdasarkan status)"
 
-#: dselect/pkgdisplay.cc:259
+#: dselect/pkgdisplay.cc
 msgid " mark:+/=/- terse:v help:?"
 msgstr " tandai:+/=/-  ringkas:v bantuan:?"
 
-#: dselect/pkgdisplay.cc:260
+#: dselect/pkgdisplay.cc
 msgid " mark:+/=/- verbose:v help:?"
 msgstr " tandai:+/=/-  rinci:v bantuan:?"
 
-#: dselect/pkgdisplay.cc:262
+#: dselect/pkgdisplay.cc
 msgid " terse:v help:?"
 msgstr " ringkas:v bantuan:?"
 
-#: dselect/pkgdisplay.cc:263
+#: dselect/pkgdisplay.cc
 msgid " verbose:v help:?"
 msgstr " rinci:v bantuan:?"
 
-#: dselect/pkginfo.cc:85
+#: dselect/pkginfo.cc
 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 "
@@ -1650,86 +1664,118 @@ msgstr ""
 "Anda dapat menggunakan `o' dan `O' untuk mengubah pengurutan dan memberikan "
 "Anda peluang untuk menandai paket dalam beragam grup berbeda."
 
-#: dselect/pkginfo.cc:98
+#: dselect/pkginfo.cc
 #, fuzzy
 msgid "Interrelationships"
 msgstr "antar hubungan"
 
-#: dselect/pkginfo.cc:117
+#: dselect/pkginfo.cc
 #, fuzzy
 msgid "No description available."
 msgstr " tidak ada keterangan yang tersedia"
 
-#: dselect/pkginfo.cc:135
+#: dselect/pkginfo.cc
 #, fuzzy
 msgid "Installed control file information"
 msgstr " Info 'control' yang terpasang untuk"
 
-#: dselect/pkginfo.cc:151
+#: dselect/pkginfo.cc
 #, fuzzy
 msgid "Available control file information"
 msgstr "versi info berkas 'control' yang tersedia"
 
-#: dselect/pkglist.cc:425
+#: dselect/pkglist.cc
 #, fuzzy
 #| msgid "Installed packages"
 msgid "there are no packages"
 msgstr "Paket-paket yang terpasang"
 
-#: dselect/pkglist.cc:521
+#: dselect/pkglist.cc
 msgid "invalid search option given"
 msgstr "pilihan pencarian tidak sah"
 
-#: dselect/pkglist.cc:536
+#: dselect/pkglist.cc
 msgid "error in regular expression"
 msgstr "ada kesalahan dalam ekspresi regular"
 
-#: dselect/pkgsublist.cc:111
+#: dselect/pkgsublist.cc
 msgid " does not appear to be available\n"
 msgstr " tampaknya tidak tersedia\n"
 
-#: dselect/pkgsublist.cc:131
+#: dselect/pkgsublist.cc
 msgid " or "
 msgstr " atau "
 
-#: dselect/pkgtop.cc:58
+#: dselect/pkgtop.cc
 msgid "All"
 msgstr "Semuanya"
 
-#: dselect/pkgtop.cc:80
+#: dselect/pkgtop.cc
 msgid "All packages"
 msgstr "Semua paket"
 
-#: dselect/pkgtop.cc:84
+#: dselect/pkgtop.cc
 #, c-format
 msgid "%s packages without a section"
 msgstr "%s paket tanpa suatu bagian"
 
-#: dselect/pkgtop.cc:86
+#: dselect/pkgtop.cc
 #, c-format
 msgid "%s packages in section %s"
 msgstr "%s paket di bagian %s"
 
-#: dselect/pkgtop.cc:92
+#: dselect/pkgtop.cc
 #, c-format
 msgid "%s %s packages"
 msgstr "%s %s paket"
 
-#: dselect/pkgtop.cc:96
+#: dselect/pkgtop.cc
 #, c-format
 msgid "%s %s packages without a section"
 msgstr "%s %s paket tanpa suatu bagian"
 
-#: dselect/pkgtop.cc:98
+#: dselect/pkgtop.cc
 #, c-format
 msgid "%s %s packages in section %s"
 msgstr "%s %s paket di bagian %s"
 
-#: dselect/pkgtop.cc:119
+#: dselect/pkgtop.cc
 #, c-format
 msgid "%-*s %s%s%s;  %s (was: %s).  %s"
 msgstr "%-*s %s%s%s; %s (tadinya: %s). %s"
 
+#, fuzzy
+#~| msgid "Section"
+#~ msgid "Actions:\n"
+#~ msgstr "Bagian"
+
+#~ msgid "Colours:\n"
+#~ msgstr "Warna: \n"
+
+#~ msgid "Attributes:\n"
+#~ msgstr "Atribut: \n"
+
+#~ msgid "EOF before option name start"
+#~ msgstr "Ada EOF sebelum awal nama pilihan"
+
+#~ msgid "EOF before summary"
+#~ msgstr "Ada EOF sebelum ikhstisar"
+
+#~ msgid "!Bug!"
+#~ msgstr "!Cacat!"
+
+#~ msgid "Updated"
+#~ msgstr "Diperbaharui"
+
+#~ msgid "Up-to-date"
+#~ msgstr "Masih baru"
+
+#~ msgid "Updated packages (newer version is available)"
+#~ msgstr "Paket-paket terbaru (versi terbaru tersedia)"
+
+#~ msgid "Available packages (not currently installed)"
+#~ msgstr "Paket-paket yagn tersedia (belum terpasang)"
+
 #~ msgid ""
 #~ "Actions:\n"
 #~ "  access update select install config remove quit\n"
diff --git a/dselect/po/it.po b/dselect/po/it.po
index 22db730cf..6d1e9103e 100644
--- a/dselect/po/it.po
+++ b/dselect/po/it.po
@@ -43,7 +43,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dselect 1.10.22\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2014-12-23 18:12+0100\n"
+"POT-Creation-Date: 2015-04-06 09:37+0200\n"
 "PO-Revision-Date: 2006-10-06 22:01+0200\n"
 "Last-Translator: Stefano Canepa <sc@linux.it>\n"
 "Language-Team: Italian <debian-l10n-italian@lists.debian.org>\n"
@@ -52,27 +52,27 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: dselect/basecmds.cc:125
+#: dselect/basecmds.cc
 msgid "Search for ? "
 msgstr "Ricerca di ? "
 
-#: dselect/basecmds.cc:149
+#: dselect/basecmds.cc
 msgid "Error: "
 msgstr "Errore: "
 
-#: dselect/basecmds.cc:180
+#: dselect/basecmds.cc
 msgid "Help: "
 msgstr "Aiuto: "
 
-#: dselect/basecmds.cc:186
+#: dselect/basecmds.cc
 msgid "Press ? for help menu, . for next topic, <space> to exit help."
 msgstr "Premi ? per menu aiuto, . prossimo argomento, <spazio> per uscire."
 
-#: dselect/basecmds.cc:193
+#: dselect/basecmds.cc
 msgid "Help information is available under the following topics:"
 msgstr "Sono disponibili informazioni di aiuto sui seguenti argomenti:"
 
-#: dselect/basecmds.cc:201
+#: dselect/basecmds.cc
 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. "
@@ -80,243 +80,243 @@ msgstr ""
 "Premi un tasto della lista sopra, <spazio> o 'q' per uscire dall'aiuto,\n"
 "  o '.' (punto) per leggere ogni pagina di aiuto in sequenza. "
 
-#: dselect/basecmds.cc:207
+#: dselect/basecmds.cc
 msgid "error reading keyboard in help"
 msgstr "errore di lettura della tastiera nell'aiuto"
 
-#: dselect/baselist.cc:60
+#: dselect/baselist.cc
 msgid "ioctl(TIOCGWINSZ) failed"
 msgstr "ioctl(TIOCGWINSZ) fallita"
 
-#: dselect/baselist.cc:63
+#: dselect/baselist.cc
 msgid "doupdate in SIGWINCH handler failed"
 msgstr "fallita doupdate nel gestore SIGWINCH"
 
-#: dselect/baselist.cc:72
+#: dselect/baselist.cc
 msgid "failed to restore old SIGWINCH sigact"
 msgstr "impossibile ripristinare la vecchia \"sigact\" su SIGWINCH"
 
-#: dselect/baselist.cc:75
+#: dselect/baselist.cc
 msgid "failed to restore old signal mask"
 msgstr "impossibile ripristinare la vecchia maschera dei segnali"
 
-#: dselect/baselist.cc:86
+#: dselect/baselist.cc
 msgid "failed to get old signal mask"
 msgstr "impossibile ottenere la vecchia maschera dei segnali"
 
-#: dselect/baselist.cc:88
+#: dselect/baselist.cc
 msgid "failed to get old SIGWINCH sigact"
 msgstr "impossibile ottenere la vecchia \"sigact\" su SIGWINCH"
 
-#: dselect/baselist.cc:93
+#: dselect/baselist.cc
 msgid "failed to block SIGWINCH"
 msgstr "impossibile bloccare SIGWINCH"
 
-#: dselect/baselist.cc:99
+#: dselect/baselist.cc
 msgid "failed to set new SIGWINCH sigact"
 msgstr "impossibile impostare la nuova \"sigact\" su SIGWINCH"
 
-#: dselect/baselist.cc:174
+#: dselect/baselist.cc
 msgid "failed to allocate colour pair"
 msgstr "impossibile allocare le coppie di colori"
 
-#: dselect/baselist.cc:203
+#: dselect/baselist.cc
 msgid "failed to create title window"
 msgstr "impossibile creare la finestra del titolo"
 
-#: dselect/baselist.cc:207
+#: dselect/baselist.cc
 msgid "failed to create whatinfo window"
 msgstr "impossibile creare la finestra di descrizione delle informazioni"
 
-#: dselect/baselist.cc:211
+#: dselect/baselist.cc
 msgid "failed to create baselist pad"
 msgstr "impossibile creare la schermata per la lista di base"
 
-#: dselect/baselist.cc:214
+#: dselect/baselist.cc
 msgid "failed to create heading pad"
 msgstr "impossibile creare la schermata per l'intestazione"
 
-#: dselect/baselist.cc:218
+#: dselect/baselist.cc
 msgid "failed to create thisstate pad"
 msgstr "impossibile creare la schermata per lo stato del pacchetto"
 
-#: dselect/baselist.cc:222
+#: dselect/baselist.cc
 msgid "failed to create info pad"
 msgstr "impossibile creare la schermata delle informazioni"
 
-#: dselect/baselist.cc:227
+#: dselect/baselist.cc
 msgid "failed to create query window"
 msgstr "impossibile creare la finestra di ricerca"
 
-#: dselect/baselist.cc:298
+#: dselect/baselist.cc
 #, fuzzy
 msgid "Keybindings"
 msgstr "funzionalità dei tasti"
 
-#: dselect/baselist.cc:347
+#: dselect/baselist.cc
 #, c-format
 msgid "  -- %d%%, press "
 msgstr "  -- %d%%, premi "
 
-#: dselect/baselist.cc:350
+#: dselect/baselist.cc
 #, c-format
 msgid "%s for more"
 msgstr "%s per vedere il resto"
 
-#: dselect/baselist.cc:354
+#: dselect/baselist.cc
 #, c-format
 msgid "%s to go back"
 msgstr "%s per tornare indietro"
 
-#: dselect/bindings.cc:78
+#: dselect/bindings.cc
 msgid "[not bound]"
 msgstr "[non associato ad alcuna funzione]"
 
-#: dselect/bindings.cc:82
+#: dselect/bindings.cc
 #, c-format
 msgid "[unk: %d]"
 msgstr "[sconosc.: %d]"
 
-#: dselect/bindings.cc:141
+#: dselect/bindings.cc
 msgid "Scroll onwards through help/information"
 msgstr "Scorri l'aiuto/informazione in avanti"
 
-#: dselect/bindings.cc:142
+#: dselect/bindings.cc
 msgid "Scroll backwards through help/information"
 msgstr "Scorri l'aiuto/informazione indietro"
 
-#: dselect/bindings.cc:143
+#: dselect/bindings.cc
 msgid "Move up"
 msgstr "Spostati in su"
 
-#: dselect/bindings.cc:144
+#: dselect/bindings.cc
 msgid "Move down"
 msgstr "Spostati in giù"
 
-#: dselect/bindings.cc:145
+#: dselect/bindings.cc
 msgid "Go to top of list"
 msgstr "Vai all'inizio della lista"
 
-#: dselect/bindings.cc:146
+#: dselect/bindings.cc
 msgid "Go to end of list"
 msgstr "Vai alla fine della lista"
 
-#: dselect/bindings.cc:147
+#: dselect/bindings.cc
 msgid "Request help (cycle through help screens)"
 msgstr "Richiedi aiuto (vedi le varie pagine di aiuto)"
 
-#: dselect/bindings.cc:148
+#: dselect/bindings.cc
 msgid "Cycle through information displays"
 msgstr "Vedi le varie pagine di informazione"
 
-#: dselect/bindings.cc:149
+#: dselect/bindings.cc
 msgid "Redraw display"
 msgstr "Ridisegna la schermata"
 
-#: dselect/bindings.cc:150
+#: dselect/bindings.cc
 msgid "Scroll onwards through list by 1 line"
 msgstr "Scorri la lista in avanti di una riga"
 
-#: dselect/bindings.cc:151
+#: dselect/bindings.cc
 msgid "Scroll backwards through list by 1 line"
 msgstr "Scorri la lista indietro di una riga"
 
-#: dselect/bindings.cc:152
+#: dselect/bindings.cc
 msgid "Scroll onwards through help/information by 1 line"
 msgstr "Scorri l'aiuto/informazione in avanti di una riga"
 
-#: dselect/bindings.cc:153
+#: dselect/bindings.cc
 msgid "Scroll backwards through help/information by 1 line"
 msgstr "Scorri l'aiuto/informazione indietro di una riga"
 
-#: dselect/bindings.cc:154
+#: dselect/bindings.cc
 msgid "Scroll onwards through list"
 msgstr "Scorri la lista in avanti"
 
-#: dselect/bindings.cc:155
+#: dselect/bindings.cc
 msgid "Scroll backwards through list"
 msgstr "Scorri la lista indietro"
 
-#: dselect/bindings.cc:158
+#: dselect/bindings.cc
 msgid "Mark package(s) for installation"
 msgstr "Contrassegna i pacchetti per l'installazione"
 
-#: dselect/bindings.cc:159
+#: dselect/bindings.cc
 msgid "Mark package(s) for deinstallation"
 msgstr "Contrassegna i pacchetti per la disinstallazione"
 
-#: dselect/bindings.cc:160
+#: dselect/bindings.cc
 msgid "Mark package(s) for deinstall and purge"
 msgstr "Contrassegna i pacchetti per la disinstallazione ed eliminazione"
 
-#: dselect/bindings.cc:161
+#: dselect/bindings.cc
 msgid "Make highlight more specific"
 msgstr "Rendi l'evidenziazione più specifica"
 
-#: dselect/bindings.cc:162
+#: dselect/bindings.cc
 msgid "Make highlight less specific"
 msgstr "Rendi l'evidenziazione meno specifica"
 
-#: dselect/bindings.cc:163
+#: dselect/bindings.cc
 msgid "Search for a package whose name contains a string"
 msgstr "Ricerca un pacchetto il cui nome contenga una stringa"
 
-#: dselect/bindings.cc:164
+#: dselect/bindings.cc
 #, fuzzy
 #| msgid "Repeat last search."
 msgid "Repeat last search"
 msgstr "Ripeti l'ultima ricerca."
 
-#: dselect/bindings.cc:165
+#: dselect/bindings.cc
 msgid "Swap sort order priority/section"
 msgstr "Scambia l'ordinamento priorità/sezione"
 
-#: dselect/bindings.cc:166
+#: dselect/bindings.cc
 msgid "Quit, confirming, and checking dependencies"
 msgstr "Esci, confermando, con controllo delle dipendenze"
 
-#: dselect/bindings.cc:167
+#: dselect/bindings.cc
 msgid "Quit, confirming without check"
 msgstr "Esci, confermando senza ulteriori controlli"
 
-#: dselect/bindings.cc:168
+#: dselect/bindings.cc
 msgid "Quit, rejecting conflict/dependency suggestions"
 msgstr "Esci, rifiutando i suggerimenti sui conflitti/dipendenze"
 
-#: dselect/bindings.cc:169
+#: dselect/bindings.cc
 msgid "Abort - quit without making changes"
 msgstr "Abbandona - esci senza apportare alcuna modifica"
 
-#: dselect/bindings.cc:170
+#: dselect/bindings.cc
 msgid "Revert to old state for all packages"
 msgstr "Ripristina lo stato precedente per tutti i pacchetti"
 
-#: dselect/bindings.cc:171
+#: dselect/bindings.cc
 msgid "Revert to suggested state for all packages"
 msgstr "Ripristina lo stato suggerito per tutti i pacchetti"
 
-#: dselect/bindings.cc:172
+#: dselect/bindings.cc
 msgid "Revert to directly requested state for all packages"
 msgstr "Ripristina lo stato espressamente richiesto per tutti i pacchetti"
 
-#: dselect/bindings.cc:173
+#: dselect/bindings.cc
 #, fuzzy
 msgid "Revert to currently installed state for all packages"
 msgstr "Ripristina lo stato espressamente richiesto per tutti i pacchetti"
 
-#: dselect/bindings.cc:176
+#: dselect/bindings.cc
 msgid "Select currently-highlighted access method"
 msgstr "Seleziona il metodo evidenziato"
 
-#: dselect/bindings.cc:177
+#: dselect/bindings.cc
 msgid "Quit without changing selected access method"
 msgstr "Esci senza cambiare il metodo di accesso"
 
-#: dselect/helpmsgs.cc:29
+#: dselect/helpmsgs.cc
 msgid "Keystrokes"
 msgstr "Funzionalità dei Tasti"
 
-#: dselect/helpmsgs.cc:29
+#: dselect/helpmsgs.cc
 #, fuzzy
 msgid ""
 "Motion keys: Next/Previous, Top/End, Up/Down, Backwards/Forwards:\n"
@@ -381,11 +381,11 @@ msgstr ""
 "   D     imposta tutti a stato Dirett. chiesto  \\   ripeti l'ultima "
 "ricerca\n"
 
-#: dselect/helpmsgs.cc:55
+#: dselect/helpmsgs.cc
 msgid "Introduction to package selections"
 msgstr "Introduzione alla selezione dei pacchetti"
 
-#: dselect/helpmsgs.cc:55
+#: dselect/helpmsgs.cc
 msgid ""
 "Welcome to dselect's main package listing.\n"
 "\n"
@@ -445,11 +445,11 @@ msgstr ""
 "\n"
 "Adesso premi <spazio> per uscire dall'aiuto ed entrare nella lista.\n"
 
-#: dselect/helpmsgs.cc:80
+#: dselect/helpmsgs.cc
 msgid "Introduction to read-only package list browser"
 msgstr "Introduzione alla lista dei pacchetti (in sola lettura)"
 
-#: dselect/helpmsgs.cc:80
+#: dselect/helpmsgs.cc
 msgid ""
 "Welcome to dselect's main package listing.\n"
 "\n"
@@ -488,12 +488,12 @@ msgstr ""
 "\n"
 "Adesso premi <spazio> per lasciare l'aiuto e visitare la lista.\n"
 
-#: dselect/helpmsgs.cc:99
+#: dselect/helpmsgs.cc
 msgid "Introduction to conflict/dependency resolution sub-list"
 msgstr ""
 "Introduzione alla sotto-lista per la risoluzione dei conflitti/dipendenze"
 
-#: dselect/helpmsgs.cc:99
+#: dselect/helpmsgs.cc
 msgid ""
 "Dependency/conflict resolution - introduction.\n"
 "\n"
@@ -564,11 +564,11 @@ msgstr ""
 "Premi <spazio> per lasciare l'aiuto e visitare la sotto-lista; ricorda:"
 "`?'=aiuto\n"
 
-#: dselect/helpmsgs.cc:125
+#: dselect/helpmsgs.cc
 msgid "Display, part 1: package listing and status chars"
 msgstr "Visualizzazione, parte 1: lista dei pacchetti e caratteri di stato"
 
-#: dselect/helpmsgs.cc:125
+#: dselect/helpmsgs.cc
 #, fuzzy
 msgid ""
 "The top half of the screen shows a list of packages.  For each package you "
@@ -636,12 +636,12 @@ msgstr ""
 "installata, quella disponibile (`V' per mostrarla/nasc.) e la descr. "
 "sommaria.\n"
 
-#: dselect/helpmsgs.cc:152
+#: dselect/helpmsgs.cc
 msgid "Display, part 2: list highlight; information display"
 msgstr ""
 "Visualizzazione, parte 2: evidenziazione nella lista; vis. informazioni"
 
-#: dselect/helpmsgs.cc:152
+#: dselect/helpmsgs.cc
 msgid ""
 "* Highlight: One line in the package list will be highlighted.  It "
 "indicates\n"
@@ -694,11 +694,11 @@ msgstr ""
 "  nascondere la schermata delle informazioni o espanderla su quasi \n"
 "  tutto lo schermo.\n"
 
-#: dselect/helpmsgs.cc:176
+#: dselect/helpmsgs.cc
 msgid "Introduction to method selection display"
 msgstr "Introduzione alla selezione del metodo"
 
-#: dselect/helpmsgs.cc:176
+#: dselect/helpmsgs.cc
 msgid ""
 "dselect and dpkg can do automatic installation, loading the package files to "
 "be\n"
@@ -740,11 +740,11 @@ msgstr ""
 "Una lista completa dei tasti è disponibile premendo `k' adesso, o dal menù\n"
 "di aiuto che è raggiungibile premendo `?'.\n"
 
-#: dselect/helpmsgs.cc:196
+#: dselect/helpmsgs.cc
 msgid "Keystrokes for method selection"
 msgstr "Tasti per la selezione del metodo"
 
-#: dselect/helpmsgs.cc:196
+#: dselect/helpmsgs.cc
 #, fuzzy
 msgid ""
 "Motion keys: Next/Previous, Top/End, Up/Down, Backwards/Forwards:\n"
@@ -794,104 +794,104 @@ msgstr ""
 "  /                cerca (basta un Invio per annullarla)\n"
 "  \\                ripeti l'ultima ricerca\n"
 
-#: dselect/main.cc:63
+#: dselect/main.cc
 msgid "Type dselect --help for help."
 msgstr "Esegui dselect --help per un aiuto."
 
-#: dselect/main.cc:145
+#: dselect/main.cc
 msgid "a"
 msgstr "m"
 
-#: dselect/main.cc:145
+#: dselect/main.cc
 msgid "[A]ccess"
 msgstr "[M]etodo"
 
-#: dselect/main.cc:145
+#: dselect/main.cc
 msgid "Choose the access method to use."
 msgstr "Scegli il metodo di accesso da usare."
 
-#: dselect/main.cc:146
+#: dselect/main.cc
 msgid "u"
 msgstr "a"
 
-#: dselect/main.cc:146
+#: dselect/main.cc
 msgid "[U]pdate"
 msgstr "[A]ggiorna"
 
-#: dselect/main.cc:146
+#: dselect/main.cc
 msgid "Update list of available packages, if possible."
 msgstr "Aggiorna, se possibile, l'elenco dei pacchetti disponibili."
 
-#: dselect/main.cc:147
+#: dselect/main.cc
 msgid "s"
 msgstr "s"
 
-#: dselect/main.cc:147
+#: dselect/main.cc
 msgid "[S]elect"
 msgstr "[S]eleziona"
 
-#: dselect/main.cc:147
+#: dselect/main.cc
 msgid "Request which packages you want on your system."
 msgstr "Scegli quali pacchetti vuoi nel tuo sistema."
 
-#: dselect/main.cc:148
+#: dselect/main.cc
 msgid "i"
 msgstr "i"
 
-#: dselect/main.cc:148
+#: dselect/main.cc
 msgid "[I]nstall"
 msgstr "[I]nstalla"
 
-#: dselect/main.cc:148
+#: dselect/main.cc
 msgid "Install and upgrade wanted packages."
 msgstr "Installa ed aggiorna i pacchetti scelti."
 
-#: dselect/main.cc:149
+#: dselect/main.cc
 msgid "c"
 msgstr "c"
 
-#: dselect/main.cc:149
+#: dselect/main.cc
 msgid "[C]onfig"
 msgstr "[C]onfigura"
 
-#: dselect/main.cc:149
+#: dselect/main.cc
 msgid "Configure any packages that are unconfigured."
 msgstr "Configura tutti i pacchetti ancora da configurare."
 
-#: dselect/main.cc:150
+#: dselect/main.cc
 msgid "r"
 msgstr "r"
 
-#: dselect/main.cc:150
+#: dselect/main.cc
 msgid "[R]emove"
 msgstr "[R]imuovi"
 
-#: dselect/main.cc:150
+#: dselect/main.cc
 msgid "Remove unwanted software."
 msgstr "Rimuovi il software non voluto."
 
-#: dselect/main.cc:151
+#: dselect/main.cc
 msgid "q"
 msgstr "t"
 
-#: dselect/main.cc:151
+#: dselect/main.cc
 msgid "[Q]uit"
 msgstr "[T]ermina"
 
-#: dselect/main.cc:151
+#: dselect/main.cc
 msgid "Quit dselect."
 msgstr "Esci da dselect."
 
-#: dselect/main.cc:152
+#: dselect/main.cc
 msgid "menu"
 msgstr "menù"
 
-#: dselect/main.cc:157
+#: dselect/main.cc
 #, c-format
 msgid "Debian `%s' package handling frontend version %s.\n"
 msgstr "Debian `%s' interfaccia per la gestione dei pacchetti versione %s.\n"
 
-#: dselect/main.cc:160
+#: dselect/main.cc
 #, fuzzy
 msgid ""
 "This is free software; see the GNU General Public License version 2 or\n"
@@ -901,20 +901,28 @@ msgstr ""
 "o successiva per le condizioni di copia. NON c'è alcuna garanzia.\n"
 "Si veda %s --license per il copyright e i dettagli della licenza.\n"
 
-#: dselect/main.cc:169 dselect/main.cc:217
+#: dselect/main.cc
 msgid "<standard output>"
 msgstr ""
 
-#: dselect/main.cc:180
-#, c-format
+#: dselect/main.cc
+#, fuzzy, c-format
+#| msgid ""
+#| "Usage: %s [<option> ...] [<action> ...]\n"
+#| "\n"
 msgid ""
-"Usage: %s [<option> ...] [<action> ...]\n"
+"Usage: %s [<option>...] [<command>...]\n"
 "\n"
 msgstr ""
 "Uso: %s [<opzione> ...] [<azione> ...]\n"
 "\n"
 
-#: dselect/main.cc:184
+#: dselect/main.cc
+#, c-format
+msgid "Commands:\n"
+msgstr ""
+
+#: dselect/main.cc
 #, fuzzy, c-format
 #| msgid ""
 #| "Options:\n"
@@ -928,12 +936,12 @@ msgstr ""
 #| "\n"
 msgid ""
 "Options:\n"
-"  --admindir <directory>     Use <directory> instead of %s.\n"
-"  --expert                   Turn on expert mode.\n"
-"  --debug <file> | -D<file>  Turn on debugging, sending output to <file>.\n"
-"  --colour | --color screenpart:[foreground],[background][:attr[+attr+...]]\n"
-"                             Configure screen colours.\n"
-"\n"
+"      --admindir <directory>       Use <directory> instead of %s.\n"
+"      --expert                     Turn on expert mode.\n"
+"  -D, --debug <file>               Turn on debugging, send output to "
+"<file>.\n"
+"      --color <color-spec>         Configure screen colors.\n"
+"      --colour <color-spec>        Ditto.\n"
 msgstr ""
 "Opzioni:\n"
 "  --admindir <directory>     Usa <directory> invece di %s.\n"
@@ -944,11 +952,11 @@ msgstr ""
 "                             Configura i colori dello schermo.\n"
 "\n"
 
-#: dselect/main.cc:193
+#: dselect/main.cc
 #, fuzzy, c-format
 msgid ""
-"  --help                     Show this help message.\n"
-"  --version                  Show the version.\n"
+"  -?, --help                       Show this help message.\n"
+"      --version                    Show the version.\n"
 "\n"
 msgstr ""
 "  --help                     Mostra questo messaggio di aiuto.\n"
@@ -956,66 +964,68 @@ msgstr ""
 "  --license | --licence      Mostra la licenza.\n"
 "\n"
 
-#: dselect/main.cc:197
-#, fuzzy, c-format
-#| msgid "Section"
-msgid "Actions:\n"
-msgstr "Sezione"
-
-#: dselect/main.cc:202
+#: dselect/main.cc
 #, c-format
-msgid "Screenparts:\n"
+msgid ""
+"<color-spec> is <screen-part>:[<foreground>],[<background>][:"
+"<attr>[+<attr>]...]\n"
+msgstr ""
+
+#: dselect/main.cc
+#, fuzzy, c-format
+#| msgid "Screenparts:\n"
+msgid "<screen-part> is:"
 msgstr "Settori schermata:\n"
 
-#: dselect/main.cc:207
+#: dselect/main.cc
 #, c-format
-msgid "Colours:\n"
-msgstr "Colori:\n"
+msgid "<color> is:"
+msgstr ""
 
-#: dselect/main.cc:212
+#: dselect/main.cc
 #, c-format
-msgid "Attributes:\n"
-msgstr "Attributi:\n"
+msgid "<attr> is:"
+msgstr ""
 
-#: dselect/main.cc:232
+#: dselect/main.cc
 #, c-format
 msgid "couldn't open debug file `%.255s'\n"
 msgstr "impossibile aprire il file di debug `%.255s'\n"
 
-#: dselect/main.cc:253
+#: dselect/main.cc
 #, fuzzy, c-format
 #| msgid "Invalid %s `%s'\n"
 msgid "invalid %s '%s'"
 msgstr "Elemento non valido per tabella %s: '%s'\n"
 
-#: dselect/main.cc:272
+#: dselect/main.cc
 msgid "screen part"
 msgstr "settore schermata"
 
-#: dselect/main.cc:278
+#: dselect/main.cc
 #, fuzzy
 #| msgid "Null colour specification\n"
 msgid "null colour specification"
 msgstr "Specificato un colore nullo\n"
 
-#: dselect/main.cc:286 dselect/main.cc:291
+#: dselect/main.cc
 msgid "colour"
 msgstr "colore"
 
-#: dselect/main.cc:299
+#: dselect/main.cc
 msgid "colour attribute"
 msgstr "attributo colore"
 
-#: dselect/main.cc:333
+#: dselect/main.cc
 msgid "Terminal does not appear to support cursor addressing.\n"
 msgstr ""
 "Il terminale non sembra in grado di gestire il posizionamento del cursore.\n"
 
-#: dselect/main.cc:335
+#: dselect/main.cc
 msgid "Terminal does not appear to support highlighting.\n"
 msgstr "Il terminale non sembra in grado di gestire l'evidenziazione.\n"
 
-#: dselect/main.cc:337
+#: dselect/main.cc
 #, c-format
 msgid ""
 "Set your TERM variable correctly, use a better terminal,\n"
@@ -1024,11 +1034,11 @@ msgstr ""
 "Imposta correttamente la variabile TERM, utilizza un terminale migliore,\n"
 "oppure usa lo strumento di base per la gestione dei pacchetti %s.\n"
 
-#: dselect/main.cc:340
+#: dselect/main.cc
 msgid "terminal lacks necessary features, giving up"
 msgstr "il terminale manca delle funzionalità necessarie, lascio perdere"
 
-#: dselect/main.cc:425
+#: dselect/main.cc
 msgid ""
 "\n"
 "\n"
@@ -1043,7 +1053,7 @@ msgstr ""
 "Premi <invio> per confermare la selezione.   ^L ridisegna la schermata.\n"
 "\n"
 
-#: dselect/main.cc:430
+#: dselect/main.cc
 msgid ""
 "Copyright (C) 1994-1996 Ian Jackson.\n"
 "Copyright (C) 2000,2001 Wichert Akkerman.\n"
@@ -1051,7 +1061,7 @@ msgstr ""
 "Copyright (C) 1994-1996 Ian Jackson.\n"
 "Copyright (C) 2000,2001 Wichert Akkerman.\n"
 
-#: dselect/main.cc:436
+#: dselect/main.cc
 msgid ""
 "\n"
 "\n"
@@ -1061,58 +1071,58 @@ msgstr ""
 "\n"
 "Accesso in sola lettura: è possibile solo visionare le selezioni!"
 
-#: dselect/main.cc:455
+#: dselect/main.cc
 msgid "failed to getch in main menu"
 msgstr "impossibile eseguire getch nel menù principale"
 
-#: dselect/main.cc:538
+#: dselect/main.cc
 #, c-format
 msgid "unknown action string `%.50s'"
 msgstr "stringa di azione sconosciuta `%.50s'"
 
-#: dselect/methlist.cc:66
+#: dselect/methlist.cc
 msgid "Abbrev."
 msgstr "Abbrev."
 
-#: dselect/methlist.cc:67 dselect/pkgdisplay.cc:188 dselect/pkginfo.cc:110
+#: dselect/methlist.cc dselect/pkgdisplay.cc dselect/pkginfo.cc
 msgid "Description"
 msgstr "Descrizione"
 
-#: dselect/methlist.cc:73
+#: dselect/methlist.cc
 msgid "dselect - list of access methods"
 msgstr "dselect - lista dei metodi di accesso"
 
-#: dselect/methlist.cc:82
+#: dselect/methlist.cc
 #, c-format
 msgid "Access method `%s'."
 msgstr "Metodo d'accesso `%s'."
 
-#: dselect/methlist.cc:161 dselect/pkglist.cc:587
+#: dselect/methlist.cc dselect/pkglist.cc
 msgid "doupdate failed"
 msgstr "doupdate fallita"
 
-#: dselect/methlist.cc:164 dselect/pkglist.cc:590
+#: dselect/methlist.cc dselect/pkglist.cc
 msgid "failed to unblock SIGWINCH"
 msgstr "impossibile sbloccare SIGWINCH"
 
-#: dselect/methlist.cc:169 dselect/pkglist.cc:595
+#: dselect/methlist.cc dselect/pkglist.cc
 msgid "failed to re-block SIGWINCH"
 msgstr "impossibile ribloccare SIGWINCH"
 
-#: dselect/methlist.cc:170 dselect/pkglist.cc:597
+#: dselect/methlist.cc dselect/pkglist.cc
 msgid "getch failed"
 msgstr "getch fallita"
 
-#: dselect/methlist.cc:187
+#: dselect/methlist.cc
 #, fuzzy
 msgid "Explanation"
 msgstr "spiegazioni su "
 
-#: dselect/methlist.cc:197
+#: dselect/methlist.cc
 msgid "No explanation available."
 msgstr "Nessuna spiegazione disponibile"
 
-#: dselect/method.cc:67
+#: dselect/method.cc
 #, c-format
 msgid ""
 "\n"
@@ -1123,7 +1133,7 @@ msgstr ""
 "\n"
 "%s: %s\n"
 
-#: dselect/method.cc:70
+#: dselect/method.cc
 msgid ""
 "\n"
 "Press <enter> to continue."
@@ -1131,193 +1141,203 @@ msgstr ""
 "\n"
 "Premi <invio> per continuare."
 
-#: dselect/method.cc:82
+#: dselect/method.cc
 msgid "cannot unlock access method area"
 msgstr ""
 
-#: dselect/method.cc:96
+#: dselect/method.cc
 #, fuzzy
 #| msgid " does not appear to be available\n"
 msgid "no access methods are available"
 msgstr " non sembra essere disponibile\n"
 
-#: dselect/method.cc:115
+#: dselect/method.cc
 msgid "requested operation requires superuser privilege"
 msgstr ""
 
-#: dselect/method.cc:118
+#: dselect/method.cc
 #, fuzzy
 #| msgid "Choose the access method to use."
 msgid "cannot open or create access method lockfile"
 msgstr "Scegli il metodo di accesso da usare."
 
-#: dselect/method.cc:125
+#: dselect/method.cc
 msgid "the access method area is already locked"
 msgstr ""
 
-#: dselect/method.cc:128
+#: dselect/method.cc
 #, fuzzy
 #| msgid "dselect - list of access methods"
 msgid "cannot lock access method area"
 msgstr "dselect - lista dei metodi di accesso"
 
-#: dselect/method.cc:161
+#: dselect/method.cc
 #, c-format
 msgid "Press <enter> to continue.\n"
 msgstr "Premi <invio> per continuare.\n"
 
-#: dselect/method.cc:162
+#: dselect/method.cc
 #, fuzzy
 msgid "<standard error>"
 msgstr "errore di scrittura su standard error"
 
-#: dselect/method.cc:165
+#: dselect/method.cc
 msgid "error reading acknowledgement of program failure message"
 msgstr "errore leggendo l'accettazione del messaggio di errore del programma"
 
-#: dselect/method.cc:187
+#: dselect/method.cc
 msgid "no access method is selected or configured"
 msgstr ""
 
-#: dselect/method.cc:196
+#: dselect/method.cc
 msgid "update available list script"
 msgstr "lo script di aggiornamento della disponibilità"
 
-#: dselect/method.cc:200
+#: dselect/method.cc
 msgid "installation script"
 msgstr "lo script di installazione"
 
-#: dselect/method.cc:246
+#: dselect/method.cc
 msgid "query/setup script"
 msgstr "lo script di query/setup"
 
-#: dselect/methparse.cc:53
+#: dselect/methparse.cc
 #, c-format
 msgid "syntax error in method options file `%.250s' -- %s"
 msgstr "errore di sintassi nel file di opzioni dei metodi `%.250s' -- %s"
 
-#: dselect/methparse.cc:59
+#: dselect/methparse.cc
 #, c-format
 msgid "error reading options file `%.250s'"
 msgstr "errore leggendo il file di opzioni `%.250s'"
 
-#: dselect/methparse.cc:93
+#: dselect/methparse.cc
 #, c-format
 msgid "unable to read `%.250s' directory for reading methods"
 msgstr "impossibile leggere la directory `%.250s' per leggere i metodi"
 
-#: dselect/methparse.cc:109
+#: dselect/methparse.cc
 #, c-format
 msgid "method `%.250s' has name that is too long (%d > %d characters)"
 msgstr "il metodo `%.250s' ha un nome troppo lungo (%d > %d caratteri)"
 
-#: dselect/methparse.cc:120
+#: dselect/methparse.cc
 #, c-format
 msgid "unable to access method script `%.250s'"
 msgstr "impossibile accedere allo script di metodo `%.250s'"
 
-#: dselect/methparse.cc:126
+#: dselect/methparse.cc
 #, c-format
 msgid "unable to read method options file `%.250s'"
 msgstr "impossibile leggere il file di opzioni dei metodi `%.250s'"
 
-#: dselect/methparse.cc:150
+#: dselect/methparse.cc
 msgid "non-digit where digit wanted"
 msgstr "un carattere che non è una cifra dove questa è richiesta"
 
-#: dselect/methparse.cc:153
-msgid "EOF in index string"
+#: dselect/methparse.cc
+#, fuzzy
+#| msgid "EOF in index string"
+msgid "end of file in index string"
 msgstr "EOF nella stringa di indice"
 
-#: dselect/methparse.cc:156
+#: dselect/methparse.cc
 msgid "index string too long"
 msgstr "stringa di indice troppo lunga"
 
-#: dselect/methparse.cc:159
+#: dselect/methparse.cc
 msgid "newline before option name start"
 msgstr "a-capo prima dell'inizio del nome dell'opzione"
 
-#: dselect/methparse.cc:161
-msgid "EOF before option name start"
-msgstr "EOF prima dell'inizio del nome dell'opzione"
+#: dselect/methparse.cc
+#, fuzzy
+#| msgid "newline before option name start"
+msgid "end of file before option name start"
+msgstr "a-capo prima dell'inizio del nome dell'opzione"
 
-#: dselect/methparse.cc:165
+#: dselect/methparse.cc
 msgid "nonalpha where option name start wanted"
 msgstr "carattere non alfabetico dove deve cominciare il nome dell'opzione"
 
-#: dselect/methparse.cc:167
+#: dselect/methparse.cc
 msgid "non-alphanum in option name"
 msgstr "carattere non alfanumerico nel nome dell'opzione"
 
-#: dselect/methparse.cc:170
-msgid "EOF in option name"
+#: dselect/methparse.cc
+#, fuzzy
+#| msgid "EOF in option name"
+msgid "end of file in option name"
 msgstr "EOF nel nome dell'opzione"
 
-#: dselect/methparse.cc:175
+#: dselect/methparse.cc
 msgid "newline before summary"
 msgstr "a-capo prima del sommario"
 
-#: dselect/methparse.cc:177
-msgid "EOF before summary"
-msgstr "EOF prima del sommario"
+#: dselect/methparse.cc
+#, fuzzy
+#| msgid "newline before summary"
+msgid "end of file before summary"
+msgstr "a-capo prima del sommario"
 
-#: dselect/methparse.cc:183
-msgid "EOF in summary - missing newline"
+#: dselect/methparse.cc
+#, fuzzy
+#| msgid "EOF in summary - missing newline"
+msgid "end of file in summary - missing newline"
 msgstr "EOF nel sommario - manca l'a-capo"
 
-#: dselect/methparse.cc:193
+#: dselect/methparse.cc
 #, c-format
 msgid "unable to open option description file `%.250s'"
 msgstr "impossibile aprire il file con le descrizioni delle opzioni `%.250s'"
 
-#: dselect/methparse.cc:197
+#: dselect/methparse.cc
 #, c-format
 msgid "unable to stat option description file `%.250s'"
 msgstr ""
 "impossibile eseguire stat sul file con le descrizioni delle opzioni `%.250s'"
 
-#: dselect/methparse.cc:201
+#: dselect/methparse.cc
 #, c-format
 msgid "failed to read option description file `%.250s'"
 msgstr "impossibile leggere il file con le descrizioni delle opzioni `%.250s'"
 
-#: dselect/methparse.cc:204
+#: dselect/methparse.cc
 #, c-format
 msgid "error during read of option description file `%.250s'"
 msgstr "errore leggendo il file con le descrizioni delle opzioni `%.250s'"
 
-#: dselect/methparse.cc:227
+#: dselect/methparse.cc
 #, c-format
 msgid "error during read of method options file `%.250s'"
 msgstr "errore leggendo il file di opzioni dei metodi `%.250s'"
 
-#: dselect/methparse.cc:250
+#: dselect/methparse.cc
 #, c-format
 msgid "unable to open current option file `%.250s'"
 msgstr "impossibile aprire il file di opzioni corrente `%.250s'"
 
-#: dselect/methparse.cc:286
+#: dselect/methparse.cc
 #, c-format
 msgid "unable to write new option to `%.250s'"
 msgstr "impossibile scrivere la nuova opzione in `%.250s'"
 
-#: dselect/pkgdisplay.cc:36
+#: dselect/pkgdisplay.cc
 msgid "new package"
 msgstr "nuovo"
 
-#: dselect/pkgdisplay.cc:37
+#: dselect/pkgdisplay.cc
 msgid "install"
 msgstr "installa"
 
-#: dselect/pkgdisplay.cc:38
+#: dselect/pkgdisplay.cc
 msgid "hold"
 msgstr "blocca"
 
-#: dselect/pkgdisplay.cc:39
+#: dselect/pkgdisplay.cc
 msgid "remove"
 msgstr "rimuovi"
 
-#: dselect/pkgdisplay.cc:40
+#: dselect/pkgdisplay.cc
 msgid "purge"
 msgstr "elimina"
 
@@ -1325,331 +1345,325 @@ msgstr "elimina"
 #. * the empty string to store information about the translation. DO NOT
 #. * CHANGE THAT IN A TRANSLATION! The code really relies on that being
 #. * a single space.
-#: dselect/pkgdisplay.cc:47
+#: dselect/pkgdisplay.cc
 msgid " "
 msgstr " "
 
-#: dselect/pkgdisplay.cc:48
+#: dselect/pkgdisplay.cc
 msgid "REINSTALL"
 msgstr "REINSTALL"
 
-#: dselect/pkgdisplay.cc:51
+#: dselect/pkgdisplay.cc
 msgid "not installed"
 msgstr "non installato"
 
-#: dselect/pkgdisplay.cc:52
+#: dselect/pkgdisplay.cc
 msgid "removed (configs remain)"
 msgstr "rimosso (rimane la config.)"
 
-#: dselect/pkgdisplay.cc:53
+#: dselect/pkgdisplay.cc
 msgid "half installed"
 msgstr "install. parz."
 
-#: dselect/pkgdisplay.cc:54
+#: dselect/pkgdisplay.cc
 msgid "unpacked (not set up)"
 msgstr "spacchettato (non conf.)"
 
-#: dselect/pkgdisplay.cc:55
+#: dselect/pkgdisplay.cc
 msgid "half configured (config failed)"
 msgstr ""
 
-#: dselect/pkgdisplay.cc:56
+#: dselect/pkgdisplay.cc
 msgid "awaiting trigger processing"
 msgstr ""
 
-#: dselect/pkgdisplay.cc:57
+#: dselect/pkgdisplay.cc
 msgid "triggered"
 msgstr ""
 
-#: dselect/pkgdisplay.cc:58
+#: dselect/pkgdisplay.cc
 msgid "installed"
 msgstr "installato"
 
-#: dselect/pkgdisplay.cc:61
+#: dselect/pkgdisplay.cc
 msgid "Required"
 msgstr "essenziali"
 
-#: dselect/pkgdisplay.cc:62
+#: dselect/pkgdisplay.cc
 msgid "Important"
 msgstr "importanti"
 
-#: dselect/pkgdisplay.cc:63
+#: dselect/pkgdisplay.cc
 msgid "Standard"
 msgstr "standard"
 
-#: dselect/pkgdisplay.cc:64
+#: dselect/pkgdisplay.cc
 msgid "Optional"
 msgstr "opzionali"
 
-#: dselect/pkgdisplay.cc:65
+#: dselect/pkgdisplay.cc
 msgid "Extra"
 msgstr "extra"
 
-#: dselect/pkgdisplay.cc:66
-msgid "!Bug!"
-msgstr "!Bug!"
-
-#: dselect/pkgdisplay.cc:67
+#: dselect/pkgdisplay.cc
 msgid "Unclassified"
 msgstr "non classific."
 
-#: dselect/pkgdisplay.cc:70
+#: dselect/pkgdisplay.cc
 msgid "suggests"
 msgstr "suggerisce"
 
-#: dselect/pkgdisplay.cc:71
+#: dselect/pkgdisplay.cc
 msgid "recommends"
 msgstr "raccomanda"
 
-#: dselect/pkgdisplay.cc:72
+#: dselect/pkgdisplay.cc
 msgid "depends on"
 msgstr "dipende da"
 
-#: dselect/pkgdisplay.cc:73
+#: dselect/pkgdisplay.cc
 msgid "pre-depends on"
 msgstr "pre-dipende da"
 
-#: dselect/pkgdisplay.cc:74
+#: dselect/pkgdisplay.cc
 msgid "breaks"
 msgstr ""
 
-#: dselect/pkgdisplay.cc:75
+#: dselect/pkgdisplay.cc
 msgid "conflicts with"
 msgstr "è in conflitto con"
 
-#: dselect/pkgdisplay.cc:76
+#: dselect/pkgdisplay.cc
 msgid "provides"
 msgstr "fornisce"
 
-#: dselect/pkgdisplay.cc:77
+#: dselect/pkgdisplay.cc
 msgid "replaces"
 msgstr "sostituisce"
 
-#: dselect/pkgdisplay.cc:78
+#: dselect/pkgdisplay.cc
 msgid "enhances"
 msgstr "estende"
 
-#: dselect/pkgdisplay.cc:81
+#: dselect/pkgdisplay.cc
 msgid "Req"
 msgstr "Ess"
 
-#: dselect/pkgdisplay.cc:82
+#: dselect/pkgdisplay.cc
 msgid "Imp"
 msgstr "Imp"
 
-#: dselect/pkgdisplay.cc:83
+#: dselect/pkgdisplay.cc
 msgid "Std"
 msgstr "Std"
 
-#: dselect/pkgdisplay.cc:84
+#: dselect/pkgdisplay.cc
 msgid "Opt"
 msgstr "Opz"
 
-#: dselect/pkgdisplay.cc:85
+#: dselect/pkgdisplay.cc
 msgid "Xtr"
 msgstr "Xtr"
 
-#: dselect/pkgdisplay.cc:86
+#: dselect/pkgdisplay.cc
 msgid "bUG"
 msgstr "bUG"
 
-#: dselect/pkgdisplay.cc:87
+#: dselect/pkgdisplay.cc
 msgid "?"
 msgstr "?"
 
-#: dselect/pkgdisplay.cc:95 dselect/pkgdisplay.cc:115
+#: dselect/pkgdisplay.cc
 msgid "Broken"
 msgstr "difettosi"
 
-#: dselect/pkgdisplay.cc:96
+#: dselect/pkgdisplay.cc
 msgid "New"
 msgstr "nuovi"
 
-#: dselect/pkgdisplay.cc:97
-msgid "Updated"
-msgstr "da aggiornare"
+#: dselect/pkgdisplay.cc
+msgid "Upgradable"
+msgstr ""
 
-#: dselect/pkgdisplay.cc:98
+#: dselect/pkgdisplay.cc
 msgid "Obsolete/local"
 msgstr "obsoleti o locali"
 
-#: dselect/pkgdisplay.cc:99
-msgid "Up-to-date"
-msgstr "già aggiornati"
+#: dselect/pkgdisplay.cc
+msgid "Installed"
+msgstr "Installato"
 
-#: dselect/pkgdisplay.cc:100
+#: dselect/pkgdisplay.cc
 msgid "Available"
 msgstr "disponibili"
 
-#: dselect/pkgdisplay.cc:101 dselect/pkgdisplay.cc:117
+#: dselect/pkgdisplay.cc
 msgid "Removed"
 msgstr "rimossi"
 
-#: dselect/pkgdisplay.cc:102 dselect/pkgdisplay.cc:111
+#: dselect/pkgdisplay.cc
 msgid "Brokenly installed packages"
 msgstr "Pacchetti installati con difetti"
 
-#: dselect/pkgdisplay.cc:103
+#: dselect/pkgdisplay.cc
 msgid "Newly available packages"
 msgstr "Nuovi pacchetti disponibili"
 
-#: dselect/pkgdisplay.cc:104
-msgid "Updated packages (newer version is available)"
-msgstr "Pacchetti aggiornabili (è disponibile una nuova versione)"
+#: dselect/pkgdisplay.cc
+#, fuzzy
+#| msgid "Newly available packages"
+msgid "Upgradable packages"
+msgstr "Nuovi pacchetti disponibili"
 
-#: dselect/pkgdisplay.cc:105
-msgid "Obsolete and local packages present on system"
+#: dselect/pkgdisplay.cc
+#, fuzzy
+#| msgid "Obsolete and local packages present on system"
+msgid "Obsolete and locally created packages"
 msgstr "Pacchetti obsoleti e locali presenti nel sistema"
 
-#: dselect/pkgdisplay.cc:106
-msgid "Up to date installed packages"
-msgstr "Pacchetti aggiornati già installati"
+#: dselect/pkgdisplay.cc
+msgid "Installed packages"
+msgstr "Pacchetti installati"
 
-#: dselect/pkgdisplay.cc:107
-msgid "Available packages (not currently installed)"
-msgstr "Pacchetti disponibili (non attualmente installati)"
+#: dselect/pkgdisplay.cc
+#, fuzzy
+#| msgid "Up to date installed packages"
+msgid "Available not installed packages"
+msgstr "Pacchetti aggiornati già installati"
 
-#: dselect/pkgdisplay.cc:108
+#: dselect/pkgdisplay.cc
 msgid "Removed and no longer available packages"
 msgstr "Pacchetti rimossi e non più disponibili"
 
-#: dselect/pkgdisplay.cc:112
-msgid "Installed packages"
-msgstr "Pacchetti installati"
-
-#: dselect/pkgdisplay.cc:113
+#: dselect/pkgdisplay.cc
 msgid "Removed packages (configuration still present)"
 msgstr "Pacchetti rimossi (la configurazione è ancora presente)"
 
-#: dselect/pkgdisplay.cc:114
+#: dselect/pkgdisplay.cc
 msgid "Purged packages and those never installed"
 msgstr "Pacchetti eliminati e quelli mai installati"
 
-#: dselect/pkgdisplay.cc:116
-msgid "Installed"
-msgstr "Installato"
-
-#: dselect/pkgdisplay.cc:118
+#: dselect/pkgdisplay.cc
 msgid "Purged"
 msgstr "Eliminato"
 
-#: dselect/pkgdisplay.cc:138
+#: dselect/pkgdisplay.cc
 msgid "Error"
 msgstr "Errore"
 
-#: dselect/pkgdisplay.cc:139
+#: dselect/pkgdisplay.cc
 msgid "Installed?"
 msgstr "Installato?"
 
-#: dselect/pkgdisplay.cc:140
+#: dselect/pkgdisplay.cc
 msgid "Old mark"
 msgstr "Precedent."
 
-#: dselect/pkgdisplay.cc:141
+#: dselect/pkgdisplay.cc
 msgid "Marked for"
 msgstr "Attualm."
 
-#: dselect/pkgdisplay.cc:143
+#: dselect/pkgdisplay.cc
 msgid "EIOM"
 msgstr "EIOM"
 
-#: dselect/pkgdisplay.cc:147 dselect/pkgdisplay.cc:150
+#: dselect/pkgdisplay.cc
 msgid "Section"
 msgstr "Sezione"
 
-#: dselect/pkgdisplay.cc:148
+#: dselect/pkgdisplay.cc
 msgid "Priority"
 msgstr "Priorità"
 
-#: dselect/pkgdisplay.cc:152
+#: dselect/pkgdisplay.cc
 msgid "Package"
 msgstr "Pacchetto"
 
-#: dselect/pkgdisplay.cc:161 dselect/pkgdisplay.cc:165
+#: dselect/pkgdisplay.cc
 #, fuzzy
 #| msgid "Avail.ver"
 msgid "Avail.arch"
 msgstr "Ver.disp."
 
-#: dselect/pkgdisplay.cc:164
+#: dselect/pkgdisplay.cc
 #, fuzzy
 #| msgid "Inst.ver"
 msgid "Inst.arch"
 msgstr "Ver.inst."
 
-#: dselect/pkgdisplay.cc:178 dselect/pkgdisplay.cc:182
+#: dselect/pkgdisplay.cc
 msgid "Avail.ver"
 msgstr "Ver.disp."
 
-#: dselect/pkgdisplay.cc:181
+#: dselect/pkgdisplay.cc
 msgid "Inst.ver"
 msgstr "Ver.inst."
 
-#: dselect/pkgdisplay.cc:197
+#: dselect/pkgdisplay.cc
 msgid "dselect - recursive package listing"
 msgstr "dselect - lista ricorsiva dei pacchetti "
 
-#: dselect/pkgdisplay.cc:199
+#: dselect/pkgdisplay.cc
 msgid "dselect - inspection of package states"
 msgstr "dselect - ispezione dello stato del pacchetto"
 
-#: dselect/pkgdisplay.cc:200
+#: dselect/pkgdisplay.cc
 msgid "dselect - main package listing"
 msgstr "dselect - lista principale"
 
-#: dselect/pkgdisplay.cc:208
+#: dselect/pkgdisplay.cc
 msgid " (by section)"
 msgstr " (per sezione)"
 
-#: dselect/pkgdisplay.cc:211
+#: dselect/pkgdisplay.cc
 msgid " (avail., section)"
 msgstr " (dispon., sezione)"
 
-#: dselect/pkgdisplay.cc:214
+#: dselect/pkgdisplay.cc
 msgid " (status, section)"
 msgstr " (stato, sezione)"
 
-#: dselect/pkgdisplay.cc:223
+#: dselect/pkgdisplay.cc
 msgid " (by priority)"
 msgstr " (per priorità)"
 
-#: dselect/pkgdisplay.cc:226
+#: dselect/pkgdisplay.cc
 msgid " (avail., priority)"
 msgstr " (dispon., priorità)"
 
-#: dselect/pkgdisplay.cc:229
+#: dselect/pkgdisplay.cc
 msgid " (status, priority)"
 msgstr " (stato, priorità)"
 
-#: dselect/pkgdisplay.cc:238
+#: dselect/pkgdisplay.cc
 msgid " (alphabetically)"
 msgstr " (alfabeticamente)"
 
-#: dselect/pkgdisplay.cc:241
+#: dselect/pkgdisplay.cc
 msgid " (by availability)"
 msgstr " (per disponibilità)"
 
-#: dselect/pkgdisplay.cc:244
+#: dselect/pkgdisplay.cc
 msgid " (by status)"
 msgstr " (per stato)"
 
-#: dselect/pkgdisplay.cc:259
+#: dselect/pkgdisplay.cc
 msgid " mark:+/=/- terse:v help:?"
 msgstr " marc:+/=/- concisa:v aiuto:?"
 
-#: dselect/pkgdisplay.cc:260
+#: dselect/pkgdisplay.cc
 msgid " mark:+/=/- verbose:v help:?"
 msgstr " marc:+/=/- estesa:v aiuto:?"
 
-#: dselect/pkgdisplay.cc:262
+#: dselect/pkgdisplay.cc
 msgid " terse:v help:?"
 msgstr " concisa:v aiuto:?"
 
-#: dselect/pkgdisplay.cc:263
+#: dselect/pkgdisplay.cc
 msgid " verbose:v help:?"
 msgstr " estesa:v aiuto:?"
 
-#: dselect/pkginfo.cc:85
+#: dselect/pkginfo.cc
 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 "
@@ -1670,86 +1684,118 @@ msgstr ""
 "l'opportunità di contrassegnare i pacchetti in differenti tipi di "
 "raggruppamento."
 
-#: dselect/pkginfo.cc:98
+#: dselect/pkginfo.cc
 #, fuzzy
 msgid "Interrelationships"
 msgstr "interrelazioni"
 
-#: dselect/pkginfo.cc:117
+#: dselect/pkginfo.cc
 #, fuzzy
 msgid "No description available."
 msgstr "nessuna descrizione disponibile."
 
-#: dselect/pkginfo.cc:135
+#: dselect/pkginfo.cc
 #, fuzzy
 msgid "Installed control file information"
 msgstr "info di controllo installate di "
 
-#: dselect/pkginfo.cc:151
+#: dselect/pkginfo.cc
 #, fuzzy
 msgid "Available control file information"
 msgstr "info di controllo della versione disponibile"
 
-#: dselect/pkglist.cc:425
+#: dselect/pkglist.cc
 #, fuzzy
 #| msgid "Installed packages"
 msgid "there are no packages"
 msgstr "Pacchetti installati"
 
-#: dselect/pkglist.cc:521
+#: dselect/pkglist.cc
 msgid "invalid search option given"
 msgstr "specificata opzione di ricerca errata"
 
-#: dselect/pkglist.cc:536
+#: dselect/pkglist.cc
 msgid "error in regular expression"
 msgstr "errore nell'espressione regolare"
 
-#: dselect/pkgsublist.cc:111
+#: dselect/pkgsublist.cc
 msgid " does not appear to be available\n"
 msgstr " non sembra essere disponibile\n"
 
-#: dselect/pkgsublist.cc:131
+#: dselect/pkgsublist.cc
 msgid " or "
 msgstr " o "
 
-#: dselect/pkgtop.cc:58
+#: dselect/pkgtop.cc
 msgid "All"
 msgstr "Tutti"
 
-#: dselect/pkgtop.cc:80
+#: dselect/pkgtop.cc
 msgid "All packages"
 msgstr "Tutti i pacchetti"
 
-#: dselect/pkgtop.cc:84
+#: dselect/pkgtop.cc
 #, c-format
 msgid "%s packages without a section"
 msgstr "Pacchetti %s senza una sezione"
 
-#: dselect/pkgtop.cc:86
+#: dselect/pkgtop.cc
 #, c-format
 msgid "%s packages in section %s"
 msgstr "Pacchetti %s nella sezione %s"
 
-#: dselect/pkgtop.cc:92
+#: dselect/pkgtop.cc
 #, c-format
 msgid "%s %s packages"
 msgstr "Pacchetti %2$s %1$s"
 
-#: dselect/pkgtop.cc:96
+#: dselect/pkgtop.cc
 #, c-format
 msgid "%s %s packages without a section"
 msgstr "Pacchetti %2$s %1$s senza una sezione"
 
-#: dselect/pkgtop.cc:98
+#: dselect/pkgtop.cc
 #, c-format
 msgid "%s %s packages in section %s"
 msgstr "Pacchetti %2$s %1$s nella sezione %3$s"
 
-#: dselect/pkgtop.cc:119
+#: dselect/pkgtop.cc
 #, c-format
 msgid "%-*s %s%s%s;  %s (was: %s).  %s"
 msgstr "%-*s %s%s%s;  %s (era: %s).  %s"
 
+#, fuzzy
+#~| msgid "Section"
+#~ msgid "Actions:\n"
+#~ msgstr "Sezione"
+
+#~ msgid "Colours:\n"
+#~ msgstr "Colori:\n"
+
+#~ msgid "Attributes:\n"
+#~ msgstr "Attributi:\n"
+
+#~ msgid "EOF before option name start"
+#~ msgstr "EOF prima dell'inizio del nome dell'opzione"
+
+#~ msgid "EOF before summary"
+#~ msgstr "EOF prima del sommario"
+
+#~ msgid "!Bug!"
+#~ msgstr "!Bug!"
+
+#~ msgid "Updated"
+#~ msgstr "da aggiornare"
+
+#~ msgid "Up-to-date"
+#~ msgstr "già aggiornati"
+
+#~ msgid "Updated packages (newer version is available)"
+#~ msgstr "Pacchetti aggiornabili (è disponibile una nuova versione)"
+
+#~ msgid "Available packages (not currently installed)"
+#~ msgstr "Pacchetti disponibili (non attualmente installati)"
+
 #~ msgid ""
 #~ "Actions:\n"
 #~ "  access update select install config remove quit\n"
diff --git a/dselect/po/ja.po b/dselect/po/ja.po
index fe7b5d51a..706635e6b 100644
--- a/dselect/po/ja.po
+++ b/dselect/po/ja.po
@@ -19,7 +19,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dselect 1.17.22\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2014-12-23 18:12+0100\n"
+"POT-Creation-Date: 2015-04-06 09:37+0200\n"
 "PO-Revision-Date: 2014-11-28 09:16+0900\n"
 "Last-Translator: Kenshi Muto <kmuto@debian.org>\n"
 "Language-Team: Japanese <debian-japanese@lists.debian.org>\n"
@@ -28,27 +28,27 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: dselect/basecmds.cc:125
+#: dselect/basecmds.cc
 msgid "Search for ? "
 msgstr "検索項目?"
 
-#: dselect/basecmds.cc:149
+#: dselect/basecmds.cc
 msgid "Error: "
 msgstr "エラー: "
 
-#: dselect/basecmds.cc:180
+#: dselect/basecmds.cc
 msgid "Help: "
 msgstr "ヘルプ: "
 
-#: dselect/basecmds.cc:186
+#: dselect/basecmds.cc
 msgid "Press ? for help menu, . for next topic, <space> to exit help."
 msgstr "ヘルプメニュー:?, 次のトピック:., ヘルプの終了:<スペース>"
 
-#: dselect/basecmds.cc:193
+#: dselect/basecmds.cc
 msgid "Help information is available under the following topics:"
 msgstr "以下のトピックからヘルプ情報を利用できます:"
 
-#: dselect/basecmds.cc:201
+#: dselect/basecmds.cc
 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. "
@@ -56,239 +56,239 @@ msgstr ""
 "上のリストからキーを入力してください。<space>、`q' でヘルプを終了します。\n"
 "または <.> でヘルプページを順次見ていくことができます。"
 
-#: dselect/basecmds.cc:207
+#: dselect/basecmds.cc
 msgid "error reading keyboard in help"
 msgstr "ヘルプのキーボード読み込みエラーです"
 
-#: dselect/baselist.cc:60
+#: dselect/baselist.cc
 msgid "ioctl(TIOCGWINSZ) failed"
 msgstr "ioctl(TIOCGWINSZ) に失敗しました"
 
-#: dselect/baselist.cc:63
+#: dselect/baselist.cc
 msgid "doupdate in SIGWINCH handler failed"
 msgstr "SIGWINCH ハンドラ内の doupdate に失敗しました"
 
-#: dselect/baselist.cc:72
+#: dselect/baselist.cc
 msgid "failed to restore old SIGWINCH sigact"
 msgstr "古い SIGWINCH sigact の復帰に失敗しました"
 
-#: dselect/baselist.cc:75
+#: dselect/baselist.cc
 msgid "failed to restore old signal mask"
 msgstr "ペースト中に p1 のオープン (fdopen) に失敗しました"
 
-#: dselect/baselist.cc:86
+#: dselect/baselist.cc
 msgid "failed to get old signal mask"
 msgstr "ペースト中に p1 のオープン (fdopen) に失敗しました"
 
-#: dselect/baselist.cc:88
+#: dselect/baselist.cc
 msgid "failed to get old SIGWINCH sigact"
 msgstr "古い SIGWINCH sigact の取得に失敗しました"
 
-#: dselect/baselist.cc:93
+#: dselect/baselist.cc
 msgid "failed to block SIGWINCH"
 msgstr "SIGWINCH のブロックに失敗しました"
 
-#: dselect/baselist.cc:99
+#: dselect/baselist.cc
 msgid "failed to set new SIGWINCH sigact"
 msgstr "新しい SIGWINCH sigact のセットに失敗しました"
 
-#: dselect/baselist.cc:174
+#: dselect/baselist.cc
 msgid "failed to allocate colour pair"
 msgstr "カラーペアの割り当てに失敗しました"
 
-#: dselect/baselist.cc:203
+#: dselect/baselist.cc
 msgid "failed to create title window"
 msgstr "タイトルウィンドウの作成に失敗しました"
 
-#: dselect/baselist.cc:207
+#: dselect/baselist.cc
 msgid "failed to create whatinfo window"
 msgstr "情報ウィンドウの作成に失敗しました"
 
-#: dselect/baselist.cc:211
+#: dselect/baselist.cc
 msgid "failed to create baselist pad"
 msgstr "基本リストパッドの作成に失敗しました"
 
-#: dselect/baselist.cc:214
+#: dselect/baselist.cc
 msgid "failed to create heading pad"
 msgstr "ヘディングパッドの作成に失敗しました"
 
-#: dselect/baselist.cc:218
+#: dselect/baselist.cc
 msgid "failed to create thisstate pad"
 msgstr "ディスステートパッドの作成に失敗しました"
 
-#: dselect/baselist.cc:222
+#: dselect/baselist.cc
 msgid "failed to create info pad"
 msgstr "情報パッドの作成に失敗しました"
 
-#: dselect/baselist.cc:227
+#: dselect/baselist.cc
 msgid "failed to create query window"
 msgstr "ディレクトリの作成に失敗しました"
 
-#: dselect/baselist.cc:298
+#: dselect/baselist.cc
 msgid "Keybindings"
 msgstr "キーバインド"
 
-#: dselect/baselist.cc:347
+#: dselect/baselist.cc
 #, c-format
 msgid "  -- %d%%, press "
 msgstr " -- %d%%、"
 
-#: dselect/baselist.cc:350
+#: dselect/baselist.cc
 #, c-format
 msgid "%s for more"
 msgstr "%s でスクロール"
 
-#: dselect/baselist.cc:354
+#: dselect/baselist.cc
 #, c-format
 msgid "%s to go back"
 msgstr "%s キーで戻る"
 
-#: dselect/bindings.cc:78
+#: dselect/bindings.cc
 msgid "[not bound]"
 msgstr "[未割り当て]"
 
-#: dselect/bindings.cc:82
+#: dselect/bindings.cc
 #, c-format
 msgid "[unk: %d]"
 msgstr "[unk: %d]"
 
-#: dselect/bindings.cc:141
+#: dselect/bindings.cc
 msgid "Scroll onwards through help/information"
 msgstr "ヘルプ/情報を前方にスクロールする"
 
-#: dselect/bindings.cc:142
+#: dselect/bindings.cc
 msgid "Scroll backwards through help/information"
 msgstr "ヘルプ/情報を後方にスクロールする"
 
-#: dselect/bindings.cc:143
+#: dselect/bindings.cc
 msgid "Move up"
 msgstr "上へ"
 
-#: dselect/bindings.cc:144
+#: dselect/bindings.cc
 msgid "Move down"
 msgstr "下へ"
 
-#: dselect/bindings.cc:145
+#: dselect/bindings.cc
 msgid "Go to top of list"
 msgstr "リストの先頭へ"
 
-#: dselect/bindings.cc:146
+#: dselect/bindings.cc
 msgid "Go to end of list"
 msgstr "リストの最後へ"
 
-#: dselect/bindings.cc:147
+#: dselect/bindings.cc
 msgid "Request help (cycle through help screens)"
 msgstr "ヘルプの呼び出し (ヘルプ画面を循環する)"
 
-#: dselect/bindings.cc:148
+#: dselect/bindings.cc
 msgid "Cycle through information displays"
 msgstr "情報画面を切り替える"
 
-#: dselect/bindings.cc:149
+#: dselect/bindings.cc
 msgid "Redraw display"
 msgstr "再描画"
 
-#: dselect/bindings.cc:150
+#: dselect/bindings.cc
 msgid "Scroll onwards through list by 1 line"
 msgstr "一覧を 1 行ごとに前方にスクロールする"
 
-#: dselect/bindings.cc:151
+#: dselect/bindings.cc
 msgid "Scroll backwards through list by 1 line"
 msgstr "一覧を 1 行ごとに後方にスクロールする"
 
-#: dselect/bindings.cc:152
+#: dselect/bindings.cc
 msgid "Scroll onwards through help/information by 1 line"
 msgstr "ヘルプ/情報を 1 行ごとに前方にスクロールする"
 
-#: dselect/bindings.cc:153
+#: dselect/bindings.cc
 msgid "Scroll backwards through help/information by 1 line"
 msgstr "ヘルプ/情報を 1 行ごとに後方にスクロールする"
 
-#: dselect/bindings.cc:154
+#: dselect/bindings.cc
 msgid "Scroll onwards through list"
 msgstr "一覧を前方にスクロールする"
 
-#: dselect/bindings.cc:155
+#: dselect/bindings.cc
 msgid "Scroll backwards through list"
 msgstr "一覧を後方にスクロールする"
 
-#: dselect/bindings.cc:158
+#: dselect/bindings.cc
 msgid "Mark package(s) for installation"
 msgstr "インストール用にマーク"
 
-#: dselect/bindings.cc:159
+#: dselect/bindings.cc
 msgid "Mark package(s) for deinstallation"
 msgstr "削除用にマーク"
 
-#: dselect/bindings.cc:160
+#: dselect/bindings.cc
 msgid "Mark package(s) for deinstall and purge"
 msgstr "削除・完全削除用にマーク"
 
-#: dselect/bindings.cc:161
+#: dselect/bindings.cc
 msgid "Make highlight more specific"
 msgstr "ハイライト部をより詳細に"
 
-#: dselect/bindings.cc:162
+#: dselect/bindings.cc
 msgid "Make highlight less specific"
 msgstr "ハイライト部をよりおおまかに"
 
-#: dselect/bindings.cc:163
+#: dselect/bindings.cc
 msgid "Search for a package whose name contains a string"
 msgstr "指定した文字を含むパッケージの名前を検索"
 
-#: dselect/bindings.cc:164
+#: dselect/bindings.cc
 msgid "Repeat last search"
 msgstr "再検索"
 
-#: dselect/bindings.cc:165
+#: dselect/bindings.cc
 msgid "Swap sort order priority/section"
 msgstr "優先度/分類 (priority/section) 順でのソートの変換"
 
-#: dselect/bindings.cc:166
+#: dselect/bindings.cc
 msgid "Quit, confirming, and checking dependencies"
 msgstr "終了、依存関係の調査を行う"
 
-#: dselect/bindings.cc:167
+#: dselect/bindings.cc
 msgid "Quit, confirming without check"
 msgstr "終了、調査を行わない"
 
-#: dselect/bindings.cc:168
+#: dselect/bindings.cc
 msgid "Quit, rejecting conflict/dependency suggestions"
 msgstr "終了、依存関係や競合解決の提案を破棄する"
 
-#: dselect/bindings.cc:169
+#: dselect/bindings.cc
 msgid "Abort - quit without making changes"
 msgstr "中断 - 変更を行わずに終了"
 
-#: dselect/bindings.cc:170
+#: dselect/bindings.cc
 msgid "Revert to old state for all packages"
 msgstr "すべてのパッケージについて古い状態に戻す"
 
-#: dselect/bindings.cc:171
+#: dselect/bindings.cc
 msgid "Revert to suggested state for all packages"
 msgstr "すべてのパッケージについて提案された状態に戻す"
 
-#: dselect/bindings.cc:172
+#: dselect/bindings.cc
 msgid "Revert to directly requested state for all packages"
 msgstr "すべてのパッケージについて直接要求した状態に戻す"
 
-#: dselect/bindings.cc:173
+#: dselect/bindings.cc
 msgid "Revert to currently installed state for all packages"
 msgstr "すべてのパッケージについて現在のインストール済み状態に戻す"
 
-#: dselect/bindings.cc:176
+#: dselect/bindings.cc
 msgid "Select currently-highlighted access method"
 msgstr "現在ハイライト表示されているアクセス方法を選択する"
 
-#: dselect/bindings.cc:177
+#: dselect/bindings.cc
 msgid "Quit without changing selected access method"
 msgstr "選択されたアクセス方法を変更せずに終了する"
 
-#: dselect/helpmsgs.cc:29
+#: dselect/helpmsgs.cc
 msgid "Keystrokes"
 msgstr "キー操作"
 
-#: dselect/helpmsgs.cc:29
+#: dselect/helpmsgs.cc
 msgid ""
 "Motion keys: Next/Previous, Top/End, Up/Down, Backwards/Forwards:\n"
 "  j, Down-arrow         k, Up-arrow             move highlight\n"
@@ -345,11 +345,11 @@ msgstr ""
 "   U     提案された状態にすべて従う      /     検索 (リターンでキャンセル)\n"
 "   D     直接要求された状態にすべて従う  n, \\  検索次候補\n"
 
-#: dselect/helpmsgs.cc:55
+#: dselect/helpmsgs.cc
 msgid "Introduction to package selections"
 msgstr "パッケージ選択の手引き"
 
-#: dselect/helpmsgs.cc:55
+#: dselect/helpmsgs.cc
 msgid ""
 "Welcome to dselect's main package listing.\n"
 "\n"
@@ -404,11 +404,11 @@ msgstr ""
 "\n"
 "<スペース> キーを押すとヘルプが終了し、パッケージ一覧画面になります。\n"
 
-#: dselect/helpmsgs.cc:80
+#: dselect/helpmsgs.cc
 msgid "Introduction to read-only package list browser"
 msgstr "パッケージ一覧ブラウザの手引き (リードオンリー)"
 
-#: dselect/helpmsgs.cc:80
+#: dselect/helpmsgs.cc
 msgid ""
 "Welcome to dselect's main package listing.\n"
 "\n"
@@ -445,11 +445,11 @@ msgstr ""
 "閲覧を終えたら、`Q' またはリターンキーを押せば終了します。\n"
 "<スペース> キーを押すとヘルプが終了し、パッケージ一覧画面になります。\n"
 
-#: dselect/helpmsgs.cc:99
+#: dselect/helpmsgs.cc
 msgid "Introduction to conflict/dependency resolution sub-list"
 msgstr "競合や依存関係解決用サブリストの手引き"
 
-#: dselect/helpmsgs.cc:99
+#: dselect/helpmsgs.cc
 msgid ""
 "Dependency/conflict resolution - introduction.\n"
 "\n"
@@ -509,11 +509,11 @@ msgstr ""
 "ヘルプを終了してサブリストに戻るには <スペース> キーを入力します。\n"
 "`?' キーでヘルプの参照ができることを覚えておいてください。\n"
 
-#: dselect/helpmsgs.cc:125
+#: dselect/helpmsgs.cc
 msgid "Display, part 1: package listing and status chars"
 msgstr "表示 (その1): パッケージ一覧とステータス文字"
 
-#: dselect/helpmsgs.cc:125
+#: dselect/helpmsgs.cc
 msgid ""
 "The top half of the screen shows a list of packages.  For each package you "
 "see\n"
@@ -573,11 +573,11 @@ msgstr ""
 "トール済みバージョンと利用可能バージョン(Shift-V で表示/非表示切り替え)、\n"
 "パッケージ要約説明も表示されます。\n"
 
-#: dselect/helpmsgs.cc:152
+#: dselect/helpmsgs.cc
 msgid "Display, part 2: list highlight; information display"
 msgstr "表示 (その2): パッケージ一覧のハイライト。情報画面"
 
-#: dselect/helpmsgs.cc:152
+#: dselect/helpmsgs.cc
 msgid ""
 "* Highlight: One line in the package list will be highlighted.  It "
 "indicates\n"
@@ -624,11 +624,11 @@ msgstr ""
 "  表示情報の切り替えは `i' キーで行えます。`I' キーで情報画面を非表示にし\n"
 "  てパッケージ一覧を全画面で表示させることができます。\n"
 
-#: dselect/helpmsgs.cc:176
+#: dselect/helpmsgs.cc
 msgid "Introduction to method selection display"
 msgstr "メソッド選択画面の手引き"
 
-#: dselect/helpmsgs.cc:176
+#: dselect/helpmsgs.cc
 msgid ""
 "dselect and dpkg can do automatic installation, loading the package files to "
 "be\n"
@@ -672,11 +672,11 @@ msgstr ""
 "キー操作一覧を参照するには、この画面で、または `?' キーを入力してヘルプメ\n"
 "ニュー画面に移ってから `k' キーを入力してください。\n"
 
-#: dselect/helpmsgs.cc:196
+#: dselect/helpmsgs.cc
 msgid "Keystrokes for method selection"
 msgstr "メソッド選択画面のキー操作"
 
-#: dselect/helpmsgs.cc:196
+#: dselect/helpmsgs.cc
 msgid ""
 "Motion keys: Next/Previous, Top/End, Up/Down, Backwards/Forwards:\n"
 "  j, Down-arrow         k, Up-arrow             move highlight\n"
@@ -721,104 +721,104 @@ msgstr ""
 "  /                検索 (リターンキーでキャンセル)\n"
 "  \\                検索次候補\n"
 
-#: dselect/main.cc:63
+#: dselect/main.cc
 msgid "Type dselect --help for help."
 msgstr "ヘルプは dselect --help で参照できます。"
 
-#: dselect/main.cc:145
+#: dselect/main.cc
 msgid "a"
 msgstr "a"
 
-#: dselect/main.cc:145
+#: dselect/main.cc
 msgid "[A]ccess"
 msgstr "アクセス(a)"
 
-#: dselect/main.cc:145
+#: dselect/main.cc
 msgid "Choose the access method to use."
 msgstr "使用するアクセス方法を選択する。"
 
-#: dselect/main.cc:146
+#: dselect/main.cc
 msgid "u"
 msgstr "u"
 
-#: dselect/main.cc:146
+#: dselect/main.cc
 msgid "[U]pdate"
 msgstr "更新(u)"
 
-#: dselect/main.cc:146
+#: dselect/main.cc
 msgid "Update list of available packages, if possible."
 msgstr "可能なら取得可能パッケージ一覧を更新する。"
 
-#: dselect/main.cc:147
+#: dselect/main.cc
 msgid "s"
 msgstr "s"
 
-#: dselect/main.cc:147
+#: dselect/main.cc
 msgid "[S]elect"
 msgstr "選択(s)"
 
-#: dselect/main.cc:147
+#: dselect/main.cc
 msgid "Request which packages you want on your system."
 msgstr "システムにインストールしたいパッケージを選択する。"
 
-#: dselect/main.cc:148
+#: dselect/main.cc
 msgid "i"
 msgstr "i"
 
-#: dselect/main.cc:148
+#: dselect/main.cc
 msgid "[I]nstall"
 msgstr "導入(i)"
 
-#: dselect/main.cc:148
+#: dselect/main.cc
 msgid "Install and upgrade wanted packages."
 msgstr "要求したパッケージのインストール・更新を行う。"
 
-#: dselect/main.cc:149
+#: dselect/main.cc
 msgid "c"
 msgstr "c"
 
-#: dselect/main.cc:149
+#: dselect/main.cc
 msgid "[C]onfig"
 msgstr "設定(c)"
 
-#: dselect/main.cc:149
+#: dselect/main.cc
 msgid "Configure any packages that are unconfigured."
 msgstr "未設定のパッケージを設定する。"
 
-#: dselect/main.cc:150
+#: dselect/main.cc
 msgid "r"
 msgstr "r"
 
-#: dselect/main.cc:150
+#: dselect/main.cc
 msgid "[R]emove"
 msgstr "削除(r)"
 
-#: dselect/main.cc:150
+#: dselect/main.cc
 msgid "Remove unwanted software."
 msgstr "不必要なソフトを削除する。"
 
-#: dselect/main.cc:151
+#: dselect/main.cc
 msgid "q"
 msgstr "q"
 
-#: dselect/main.cc:151
+#: dselect/main.cc
 msgid "[Q]uit"
 msgstr "終了(q)"
 
-#: dselect/main.cc:151
+#: dselect/main.cc
 msgid "Quit dselect."
 msgstr "dselect を終了する。"
 
-#: dselect/main.cc:152
+#: dselect/main.cc
 msgid "menu"
 msgstr "メニュー"
 
-#: dselect/main.cc:157
+#: dselect/main.cc
 #, c-format
 msgid "Debian `%s' package handling frontend version %s.\n"
 msgstr "Debian `%s' パッケージ管理フロントエンド バージョン %s。\n"
 
-#: dselect/main.cc:160
+#: dselect/main.cc
 msgid ""
 "This is free software; see the GNU General Public License version 2 or\n"
 "later for copying conditions. There is NO warranty.\n"
@@ -827,27 +827,45 @@ msgstr ""
 "ン\n"
 "2 もしくはそれ以降を参照してください。このソフトウェアは無保証です。\n"
 
-#: dselect/main.cc:169 dselect/main.cc:217
+#: dselect/main.cc
 msgid "<standard output>"
 msgstr "<標準出力>"
 
-#: dselect/main.cc:180
-#, c-format
+#: dselect/main.cc
+#, fuzzy, c-format
+#| msgid ""
+#| "Usage: %s [<option> ...] [<action> ...]\n"
+#| "\n"
 msgid ""
-"Usage: %s [<option> ...] [<action> ...]\n"
+"Usage: %s [<option>...] [<command>...]\n"
 "\n"
 msgstr "使い方: %s [<オプション> ...] [<アクション> ...]\n"
 
-#: dselect/main.cc:184
+#: dselect/main.cc
 #, c-format
+msgid "Commands:\n"
+msgstr ""
+
+#: dselect/main.cc
+#, fuzzy, c-format
+#| msgid ""
+#| "Options:\n"
+#| "  --admindir <directory>     Use <directory> instead of %s.\n"
+#| "  --expert                   Turn on expert mode.\n"
+#| "  --debug <file> | -D<file>  Turn on debugging, sending output to "
+#| "<file>.\n"
+#| "  --colour | --color screenpart:[foreground],[background][:attr[+attr"
+#| "+...]]\n"
+#| "                             Configure screen colours.\n"
+#| "\n"
 msgid ""
 "Options:\n"
-"  --admindir <directory>     Use <directory> instead of %s.\n"
-"  --expert                   Turn on expert mode.\n"
-"  --debug <file> | -D<file>  Turn on debugging, sending output to <file>.\n"
-"  --colour | --color screenpart:[foreground],[background][:attr[+attr+...]]\n"
-"                             Configure screen colours.\n"
-"\n"
+"      --admindir <directory>       Use <directory> instead of %s.\n"
+"      --expert                     Turn on expert mode.\n"
+"  -D, --debug <file>               Turn on debugging, send output to "
+"<file>.\n"
+"      --color <color-spec>         Configure screen colors.\n"
+"      --colour <color-spec>        Ditto.\n"
 msgstr ""
 "オプション:\n"
 "  --admindir <ディレクトリ>  %s の代わりに <ディレクトリ> を使う\n"
@@ -858,72 +876,79 @@ msgstr ""
 "                             画面の色を設定する\n"
 "\n"
 
-#: dselect/main.cc:193
-#, c-format
+#: dselect/main.cc
+#, fuzzy, c-format
+#| msgid ""
+#| "  --help                     Show this help message.\n"
+#| "  --version                  Show the version.\n"
+#| "\n"
 msgid ""
-"  --help                     Show this help message.\n"
-"  --version                  Show the version.\n"
+"  -?, --help                       Show this help message.\n"
+"      --version                    Show the version.\n"
 "\n"
 msgstr ""
 "  --help                     このヘルプメッセージを表示\n"
 "  --version                  バージョンを表示\n"
 "\n"
 
-#: dselect/main.cc:197
+#: dselect/main.cc
 #, c-format
-msgid "Actions:\n"
-msgstr "アクション:\n"
+msgid ""
+"<color-spec> is <screen-part>:[<foreground>],[<background>][:"
+"<attr>[+<attr>]...]\n"
+msgstr ""
 
-#: dselect/main.cc:202
-#, c-format
-msgid "Screenparts:\n"
+#: dselect/main.cc
+#, fuzzy, c-format
+#| msgid "Screenparts:\n"
+msgid "<screen-part> is:"
 msgstr "画面部:\n"
 
-#: dselect/main.cc:207
+#: dselect/main.cc
 #, c-format
-msgid "Colours:\n"
-msgstr "色:\n"
+msgid "<color> is:"
+msgstr ""
 
-#: dselect/main.cc:212
+#: dselect/main.cc
 #, c-format
-msgid "Attributes:\n"
-msgstr "属性:\n"
+msgid "<attr> is:"
+msgstr ""
 
-#: dselect/main.cc:232
+#: dselect/main.cc
 #, c-format
 msgid "couldn't open debug file `%.255s'\n"
 msgstr "デバッグファイル `%.250s' をオープンできませんでした\n"
 
-#: dselect/main.cc:253
+#: dselect/main.cc
 #, c-format
 msgid "invalid %s '%s'"
 msgstr "無効な %s `%s'"
 
-#: dselect/main.cc:272
+#: dselect/main.cc
 msgid "screen part"
 msgstr "画面部"
 
-#: dselect/main.cc:278
+#: dselect/main.cc
 msgid "null colour specification"
 msgstr "色の指定が空です"
 
-#: dselect/main.cc:286 dselect/main.cc:291
+#: dselect/main.cc
 msgid "colour"
 msgstr "色"
 
-#: dselect/main.cc:299
+#: dselect/main.cc
 msgid "colour attribute"
 msgstr "色属性"
 
-#: dselect/main.cc:333
+#: dselect/main.cc
 msgid "Terminal does not appear to support cursor addressing.\n"
 msgstr "端末がカーソル割り付けをサポートしていません。\n"
 
-#: dselect/main.cc:335
+#: dselect/main.cc
 msgid "Terminal does not appear to support highlighting.\n"
 msgstr "端末がハイライトをサポートしていません。\n"
 
-#: dselect/main.cc:337
+#: dselect/main.cc
 #, c-format
 msgid ""
 "Set your TERM variable correctly, use a better terminal,\n"
@@ -932,11 +957,11 @@ msgstr ""
 "TERM 環境変数を正しく設定してください。高機能な端末を使用するか、\n"
 "もしくはパッケージごとの管理ツール %s を使用しましょう。\n"
 
-#: dselect/main.cc:340
+#: dselect/main.cc
 msgid "terminal lacks necessary features, giving up"
 msgstr "必要とする機能がこの端末にはありません。終了します"
 
-#: dselect/main.cc:425
+#: dselect/main.cc
 msgid ""
 "\n"
 "\n"
@@ -950,7 +975,7 @@ msgstr ""
 "リターンキーで選択項目を決定します。^L で画面を再描画します。\n"
 "\n"
 
-#: dselect/main.cc:430
+#: dselect/main.cc
 msgid ""
 "Copyright (C) 1994-1996 Ian Jackson.\n"
 "Copyright (C) 2000,2001 Wichert Akkerman.\n"
@@ -958,7 +983,7 @@ msgstr ""
 "Copyright (C) 1994-1996 Ian Jackson.\n"
 "Copyright (C) 2000,2001 Wichert Akkerman.\n"
 
-#: dselect/main.cc:436
+#: dselect/main.cc
 msgid ""
 "\n"
 "\n"
@@ -968,57 +993,57 @@ msgstr ""
 "\n"
 "リードオンリーアクセス: 選択プレビューのみ利用できます!"
 
-#: dselect/main.cc:455
+#: dselect/main.cc
 msgid "failed to getch in main menu"
 msgstr "メインメニューでの getch に失敗しました"
 
-#: dselect/main.cc:538
+#: dselect/main.cc
 #, c-format
 msgid "unknown action string `%.50s'"
 msgstr "不明なアクション文字列 `%.50s' です"
 
-#: dselect/methlist.cc:66
+#: dselect/methlist.cc
 msgid "Abbrev."
 msgstr "頭文字"
 
-#: dselect/methlist.cc:67 dselect/pkgdisplay.cc:188 dselect/pkginfo.cc:110
+#: dselect/methlist.cc dselect/pkgdisplay.cc dselect/pkginfo.cc
 msgid "Description"
 msgstr "説明"
 
-#: dselect/methlist.cc:73
+#: dselect/methlist.cc
 msgid "dselect - list of access methods"
 msgstr "dselect - アクセス方法の一覧"
 
-#: dselect/methlist.cc:82
+#: dselect/methlist.cc
 #, c-format
 msgid "Access method `%s'."
 msgstr "アクセス方法 `%s'。"
 
-#: dselect/methlist.cc:161 dselect/pkglist.cc:587
+#: dselect/methlist.cc dselect/pkglist.cc
 msgid "doupdate failed"
 msgstr "doupdate 失敗"
 
-#: dselect/methlist.cc:164 dselect/pkglist.cc:590
+#: dselect/methlist.cc dselect/pkglist.cc
 msgid "failed to unblock SIGWINCH"
 msgstr "SIGWINCH のアンブロックに失敗しました"
 
-#: dselect/methlist.cc:169 dselect/pkglist.cc:595
+#: dselect/methlist.cc dselect/pkglist.cc
 msgid "failed to re-block SIGWINCH"
 msgstr "SIGWINCH のリブロックに失敗しました"
 
-#: dselect/methlist.cc:170 dselect/pkglist.cc:597
+#: dselect/methlist.cc dselect/pkglist.cc
 msgid "getch failed"
 msgstr "getch 失敗"
 
-#: dselect/methlist.cc:187
+#: dselect/methlist.cc
 msgid "Explanation"
 msgstr "説明"
 
-#: dselect/methlist.cc:197
+#: dselect/methlist.cc
 msgid "No explanation available."
 msgstr "説明がありません。"
 
-#: dselect/method.cc:67
+#: dselect/method.cc
 #, c-format
 msgid ""
 "\n"
@@ -1029,7 +1054,7 @@ msgstr ""
 "\n"
 "%s: %s\n"
 
-#: dselect/method.cc:70
+#: dselect/method.cc
 msgid ""
 "\n"
 "Press <enter> to continue."
@@ -1037,185 +1062,195 @@ msgstr ""
 "\n"
 "<Enter> を押すと続行します。"
 
-#: dselect/method.cc:82
+#: dselect/method.cc
 msgid "cannot unlock access method area"
 msgstr "アクセス方法領域をロック解除できません"
 
-#: dselect/method.cc:96
+#: dselect/method.cc
 msgid "no access methods are available"
 msgstr "アクセス方法を何も利用できません"
 
-#: dselect/method.cc:115
+#: dselect/method.cc
 msgid "requested operation requires superuser privilege"
 msgstr "要求された操作にはスーパーユーザー権限が必要です"
 
-#: dselect/method.cc:118
+#: dselect/method.cc
 msgid "cannot open or create access method lockfile"
 msgstr "アクセス方法のロックファイルをオープンまたは作成できません"
 
-#: dselect/method.cc:125
+#: dselect/method.cc
 msgid "the access method area is already locked"
 msgstr "アクセス方法領域はすでにロックされています"
 
-#: dselect/method.cc:128
+#: dselect/method.cc
 msgid "cannot lock access method area"
 msgstr "アクセス方法領域をロックできません"
 
-#: dselect/method.cc:161
+#: dselect/method.cc
 #, c-format
 msgid "Press <enter> to continue.\n"
 msgstr "<Enter> を押すと続行します。\n"
 
-#: dselect/method.cc:162
+#: dselect/method.cc
 msgid "<standard error>"
 msgstr "<標準エラー>"
 
-#: dselect/method.cc:165
+#: dselect/method.cc
 msgid "error reading acknowledgement of program failure message"
 msgstr "プログラムの失敗メッセージの受け取りに失敗しました"
 
-#: dselect/method.cc:187
+#: dselect/method.cc
 msgid "no access method is selected or configured"
 msgstr "アクセス方法が何も選択されていないか設定されていません"
 
-#: dselect/method.cc:196
+#: dselect/method.cc
 msgid "update available list script"
 msgstr "入手可能一覧スクリプトの更新"
 
-#: dselect/method.cc:200
+#: dselect/method.cc
 msgid "installation script"
 msgstr "インストールスクリプト"
 
-#: dselect/method.cc:246
+#: dselect/method.cc
 msgid "query/setup script"
 msgstr "質問/設定スクリプト"
 
-#: dselect/methparse.cc:53
+#: dselect/methparse.cc
 #, c-format
 msgid "syntax error in method options file `%.250s' -- %s"
 msgstr "メソッドオプションファイル `%.250s' 内の構文エラー -- %s"
 
-#: dselect/methparse.cc:59
+#: dselect/methparse.cc
 #, c-format
 msgid "error reading options file `%.250s'"
 msgstr "オプションファイル `%.250s' の読み込みエラー"
 
-#: dselect/methparse.cc:93
+#: dselect/methparse.cc
 #, c-format
 msgid "unable to read `%.250s' directory for reading methods"
 msgstr "メソッドを読み込むための '%.250s' を読めません"
 
-#: dselect/methparse.cc:109
+#: dselect/methparse.cc
 #, c-format
 msgid "method `%.250s' has name that is too long (%d > %d characters)"
 msgstr "メソッド `%.250s' の名前が長すぎます (%d > %d 文字)"
 
-#: dselect/methparse.cc:120
+#: dselect/methparse.cc
 #, c-format
 msgid "unable to access method script `%.250s'"
 msgstr "メソッドスクリプト `%.250s' にアクセスできません"
 
-#: dselect/methparse.cc:126
+#: dselect/methparse.cc
 #, c-format
 msgid "unable to read method options file `%.250s'"
 msgstr "メソッドオプションファイル `%.250s' の読み込みに失敗しました"
 
-#: dselect/methparse.cc:150
+#: dselect/methparse.cc
 msgid "non-digit where digit wanted"
 msgstr "数字があるべきところに数字でない文字があります"
 
-#: dselect/methparse.cc:153
-msgid "EOF in index string"
+#: dselect/methparse.cc
+#, fuzzy
+#| msgid "EOF in index string"
+msgid "end of file in index string"
 msgstr "インデックス文字列に EOF があります"
 
-#: dselect/methparse.cc:156
+#: dselect/methparse.cc
 msgid "index string too long"
 msgstr "インデックス文字列が長すぎます"
 
-#: dselect/methparse.cc:159
+#: dselect/methparse.cc
 msgid "newline before option name start"
 msgstr "オプション名が始まる前に改行があります"
 
-#: dselect/methparse.cc:161
-msgid "EOF before option name start"
-msgstr "オプション名が始まる前に EOF があります"
+#: dselect/methparse.cc
+#, fuzzy
+#| msgid "newline before option name start"
+msgid "end of file before option name start"
+msgstr "オプション名が始まる前に改行があります"
 
-#: dselect/methparse.cc:165
+#: dselect/methparse.cc
 msgid "nonalpha where option name start wanted"
 msgstr "オプション名の始まりがアルファベットではありません"
 
-#: dselect/methparse.cc:167
+#: dselect/methparse.cc
 msgid "non-alphanum in option name"
 msgstr "オプション名が英数字ではありません"
 
-#: dselect/methparse.cc:170
-msgid "EOF in option name"
+#: dselect/methparse.cc
+#, fuzzy
+#| msgid "EOF in option name"
+msgid "end of file in option name"
 msgstr "オプション名に EOF があります"
 
-#: dselect/methparse.cc:175
+#: dselect/methparse.cc
 msgid "newline before summary"
 msgstr "要約の前に改行があります"
 
-#: dselect/methparse.cc:177
-msgid "EOF before summary"
-msgstr "要約の前に EOF があります"
+#: dselect/methparse.cc
+#, fuzzy
+#| msgid "newline before summary"
+msgid "end of file before summary"
+msgstr "要約の前に改行があります"
 
-#: dselect/methparse.cc:183
-msgid "EOF in summary - missing newline"
+#: dselect/methparse.cc
+#, fuzzy
+#| msgid "EOF in summary - missing newline"
+msgid "end of file in summary - missing newline"
 msgstr "要約の中に EOF があります - 改行がありません"
 
-#: dselect/methparse.cc:193
+#: dselect/methparse.cc
 #, c-format
 msgid "unable to open option description file `%.250s'"
 msgstr "説明ファイル `%.250s' をオープンできません"
 
-#: dselect/methparse.cc:197
+#: dselect/methparse.cc
 #, c-format
 msgid "unable to stat option description file `%.250s'"
 msgstr "オプション記述ファイル `%.250s' のステータスを得られません"
 
-#: dselect/methparse.cc:201
+#: dselect/methparse.cc
 #, c-format
 msgid "failed to read option description file `%.250s'"
 msgstr "オプション記述ファイル `%.250s' の読み込みに失敗しました"
 
-#: dselect/methparse.cc:204
+#: dselect/methparse.cc
 #, c-format
 msgid "error during read of option description file `%.250s'"
 msgstr "オプション記述ファイル `%.250s' の読み込み中にエラーが発生しました"
 
-#: dselect/methparse.cc:227
+#: dselect/methparse.cc
 #, c-format
 msgid "error during read of method options file `%.250s'"
 msgstr "メソッドオプションファイル `%.250s' の読み込み中にエラーが発生しました"
 
-#: dselect/methparse.cc:250
+#: dselect/methparse.cc
 #, c-format
 msgid "unable to open current option file `%.250s'"
 msgstr "現在のオプションファイル `%.250s' をオープンできません"
 
-#: dselect/methparse.cc:286
+#: dselect/methparse.cc
 #, c-format
 msgid "unable to write new option to `%.250s'"
 msgstr "新しいオプションを `%.255s' に書き込むことができません"
 
-#: dselect/pkgdisplay.cc:36
+#: dselect/pkgdisplay.cc
 msgid "new package"
 msgstr "新パッケージ"
 
-#: dselect/pkgdisplay.cc:37
+#: dselect/pkgdisplay.cc
 msgid "install"
 msgstr "install"
 
-#: dselect/pkgdisplay.cc:38
+#: dselect/pkgdisplay.cc
 msgid "hold"
 msgstr "保持"
 
-#: dselect/pkgdisplay.cc:39
+#: dselect/pkgdisplay.cc
 msgid "remove"
 msgstr "remove"
 
-#: dselect/pkgdisplay.cc:40
+#: dselect/pkgdisplay.cc
 msgid "purge"
 msgstr "完全削除"
 
@@ -1223,327 +1258,321 @@ msgstr "完全削除"
 #. * the empty string to store information about the translation. DO NOT
 #. * CHANGE THAT IN A TRANSLATION! The code really relies on that being
 #. * a single space.
-#: dselect/pkgdisplay.cc:47
+#: dselect/pkgdisplay.cc
 msgid " "
 msgstr " "
 
-#: dselect/pkgdisplay.cc:48
+#: dselect/pkgdisplay.cc
 msgid "REINSTALL"
 msgstr "再インストール"
 
-#: dselect/pkgdisplay.cc:51
+#: dselect/pkgdisplay.cc
 msgid "not installed"
 msgstr "未導入"
 
-#: dselect/pkgdisplay.cc:52
+#: dselect/pkgdisplay.cc
 msgid "removed (configs remain)"
 msgstr "未インストール (設定は保存)"
 
-#: dselect/pkgdisplay.cc:53
+#: dselect/pkgdisplay.cc
 msgid "half installed"
 msgstr "インストール済み"
 
-#: dselect/pkgdisplay.cc:54
+#: dselect/pkgdisplay.cc
 msgid "unpacked (not set up)"
 msgstr "展開(未設定)"
 
-#: dselect/pkgdisplay.cc:55
+#: dselect/pkgdisplay.cc
 msgid "half configured (config failed)"
 msgstr "設定途中 (設定の失敗)"
 
-#: dselect/pkgdisplay.cc:56
+#: dselect/pkgdisplay.cc
 msgid "awaiting trigger processing"
 msgstr "トリガ処理待ち"
 
-#: dselect/pkgdisplay.cc:57
+#: dselect/pkgdisplay.cc
 msgid "triggered"
 msgstr "トリガー済み"
 
-#: dselect/pkgdisplay.cc:58
+#: dselect/pkgdisplay.cc
 msgid "installed"
 msgstr "導入済み"
 
-#: dselect/pkgdisplay.cc:61
+#: dselect/pkgdisplay.cc
 msgid "Required"
 msgstr "必須"
 
-#: dselect/pkgdisplay.cc:62
+#: dselect/pkgdisplay.cc
 msgid "Important"
 msgstr "重要"
 
-#: dselect/pkgdisplay.cc:63
+#: dselect/pkgdisplay.cc
 msgid "Standard"
 msgstr "標準"
 
-#: dselect/pkgdisplay.cc:64
+#: dselect/pkgdisplay.cc
 msgid "Optional"
 msgstr "任意"
 
-#: dselect/pkgdisplay.cc:65
+#: dselect/pkgdisplay.cc
 msgid "Extra"
 msgstr "特別"
 
-#: dselect/pkgdisplay.cc:66
-msgid "!Bug!"
-msgstr "!バグ!"
-
-#: dselect/pkgdisplay.cc:67
+#: dselect/pkgdisplay.cc
 msgid "Unclassified"
 msgstr "分類不可"
 
-#: dselect/pkgdisplay.cc:70
+#: dselect/pkgdisplay.cc
 msgid "suggests"
 msgstr "は以下のパッケージを提案しています:"
 
-#: dselect/pkgdisplay.cc:71
+#: dselect/pkgdisplay.cc
 msgid "recommends"
 msgstr "は以下のパッケージを推奨しています:"
 
-#: dselect/pkgdisplay.cc:72
+#: dselect/pkgdisplay.cc
 msgid "depends on"
 msgstr "は以下のパッケージに依存しています:"
 
-#: dselect/pkgdisplay.cc:73
+#: dselect/pkgdisplay.cc
 msgid "pre-depends on"
 msgstr "は以下のパッケージに先行依存しています:"
 
-#: dselect/pkgdisplay.cc:74
+#: dselect/pkgdisplay.cc
 msgid "breaks"
 msgstr "破壊"
 
-#: dselect/pkgdisplay.cc:75
+#: dselect/pkgdisplay.cc
 msgid "conflicts with"
 msgstr "は以下のパッケージと競合しています:"
 
-#: dselect/pkgdisplay.cc:76
+#: dselect/pkgdisplay.cc
 msgid "provides"
 msgstr "は以下のパッケージを提供しています:"
 
-#: dselect/pkgdisplay.cc:77
+#: dselect/pkgdisplay.cc
 msgid "replaces"
 msgstr "置換"
 
-#: dselect/pkgdisplay.cc:78
+#: dselect/pkgdisplay.cc
 msgid "enhances"
 msgstr "拡張"
 
-#: dselect/pkgdisplay.cc:81
+#: dselect/pkgdisplay.cc
 msgid "Req"
 msgstr "必"
 
-#: dselect/pkgdisplay.cc:82
+#: dselect/pkgdisplay.cc
 msgid "Imp"
 msgstr "重"
 
-#: dselect/pkgdisplay.cc:83
+#: dselect/pkgdisplay.cc
 msgid "Std"
 msgstr "標"
 
-#: dselect/pkgdisplay.cc:84
+#: dselect/pkgdisplay.cc
 msgid "Opt"
 msgstr "任"
 
-#: dselect/pkgdisplay.cc:85
+#: dselect/pkgdisplay.cc
 msgid "Xtr"
 msgstr "特"
 
-#: dselect/pkgdisplay.cc:86
+#: dselect/pkgdisplay.cc
 msgid "bUG"
 msgstr "バ"
 
-#: dselect/pkgdisplay.cc:87
+#: dselect/pkgdisplay.cc
 msgid "?"
 msgstr "?"
 
-#: dselect/pkgdisplay.cc:95 dselect/pkgdisplay.cc:115
+#: dselect/pkgdisplay.cc
 msgid "Broken"
 msgstr "壊れている"
 
-#: dselect/pkgdisplay.cc:96
+#: dselect/pkgdisplay.cc
 msgid "New"
 msgstr "新規"
 
-#: dselect/pkgdisplay.cc:97
-msgid "Updated"
-msgstr "更新されている"
+#: dselect/pkgdisplay.cc
+msgid "Upgradable"
+msgstr ""
 
-#: dselect/pkgdisplay.cc:98
+#: dselect/pkgdisplay.cc
 msgid "Obsolete/local"
 msgstr "廃止/ローカル"
 
-#: dselect/pkgdisplay.cc:99
-msgid "Up-to-date"
-msgstr "最新"
+#: dselect/pkgdisplay.cc
+msgid "Installed"
+msgstr "導入済み"
 
-#: dselect/pkgdisplay.cc:100
+#: dselect/pkgdisplay.cc
 msgid "Available"
 msgstr "取得可能"
 
-#: dselect/pkgdisplay.cc:101 dselect/pkgdisplay.cc:117
+#: dselect/pkgdisplay.cc
 msgid "Removed"
 msgstr "削除"
 
-#: dselect/pkgdisplay.cc:102 dselect/pkgdisplay.cc:111
+#: dselect/pkgdisplay.cc
 msgid "Brokenly installed packages"
 msgstr "うまくインストールされていないパッケージ"
 
-#: dselect/pkgdisplay.cc:103
+#: dselect/pkgdisplay.cc
 msgid "Newly available packages"
 msgstr "取得可能新パッケージ"
 
-#: dselect/pkgdisplay.cc:104
-msgid "Updated packages (newer version is available)"
-msgstr "更新されているパッケージ (新バージョンが取得可能)"
+#: dselect/pkgdisplay.cc
+#, fuzzy
+#| msgid "Newly available packages"
+msgid "Upgradable packages"
+msgstr "取得可能新パッケージ"
 
-#: dselect/pkgdisplay.cc:105
-msgid "Obsolete and local packages present on system"
+#: dselect/pkgdisplay.cc
+#, fuzzy
+#| msgid "Obsolete and local packages present on system"
+msgid "Obsolete and locally created packages"
 msgstr "システムに残っている、廃止されたまたはローカルなパッケージ"
 
-#: dselect/pkgdisplay.cc:106
-msgid "Up to date installed packages"
-msgstr "インストールされている最新パッケージ"
+#: dselect/pkgdisplay.cc
+msgid "Installed packages"
+msgstr "インストール済みのパッケージ"
 
-#: dselect/pkgdisplay.cc:107
-msgid "Available packages (not currently installed)"
-msgstr "取得可能パッケージ (未インストール)"
+#: dselect/pkgdisplay.cc
+#, fuzzy
+#| msgid "Up to date installed packages"
+msgid "Available not installed packages"
+msgstr "インストールされている最新パッケージ"
 
-#: dselect/pkgdisplay.cc:108
+#: dselect/pkgdisplay.cc
 msgid "Removed and no longer available packages"
 msgstr "削除されて利用不可能なパッケージ"
 
-#: dselect/pkgdisplay.cc:112
-msgid "Installed packages"
-msgstr "インストール済みのパッケージ"
-
-#: dselect/pkgdisplay.cc:113
+#: dselect/pkgdisplay.cc
 msgid "Removed packages (configuration still present)"
 msgstr "削除されているパッケージ (設定ファイルは存在)"
 
-#: dselect/pkgdisplay.cc:114
+#: dselect/pkgdisplay.cc
 msgid "Purged packages and those never installed"
 msgstr "削除されて、一度もインストールされていない"
 
-#: dselect/pkgdisplay.cc:116
-msgid "Installed"
-msgstr "導入済み"
-
-#: dselect/pkgdisplay.cc:118
+#: dselect/pkgdisplay.cc
 msgid "Purged"
 msgstr "完全削除"
 
-#: dselect/pkgdisplay.cc:138
+#: dselect/pkgdisplay.cc
 msgid "Error"
 msgstr "エラー"
 
-#: dselect/pkgdisplay.cc:139
+#: dselect/pkgdisplay.cc
 msgid "Installed?"
 msgstr "導入?"
 
-#: dselect/pkgdisplay.cc:140
+#: dselect/pkgdisplay.cc
 msgid "Old mark"
 msgstr "前回"
 
-#: dselect/pkgdisplay.cc:141
+#: dselect/pkgdisplay.cc
 msgid "Marked for"
 msgstr "今回"
 
-#: dselect/pkgdisplay.cc:143
+#: dselect/pkgdisplay.cc
 msgid "EIOM"
 msgstr "EIOM"
 
-#: dselect/pkgdisplay.cc:147 dselect/pkgdisplay.cc:150
+#: dselect/pkgdisplay.cc
 msgid "Section"
 msgstr "分類"
 
-#: dselect/pkgdisplay.cc:148
+#: dselect/pkgdisplay.cc
 msgid "Priority"
 msgstr "優"
 
-#: dselect/pkgdisplay.cc:152
+#: dselect/pkgdisplay.cc
 msgid "Package"
 msgstr "パッケージ"
 
-#: dselect/pkgdisplay.cc:161 dselect/pkgdisplay.cc:165
+#: dselect/pkgdisplay.cc
 msgid "Avail.arch"
 msgstr "可能Arch"
 
-#: dselect/pkgdisplay.cc:164
+#: dselect/pkgdisplay.cc
 msgid "Inst.arch"
 msgstr "導入Arch"
 
-#: dselect/pkgdisplay.cc:178 dselect/pkgdisplay.cc:182
+#: dselect/pkgdisplay.cc
 msgid "Avail.ver"
 msgstr "可能Ver"
 
-#: dselect/pkgdisplay.cc:181
+#: dselect/pkgdisplay.cc
 msgid "Inst.ver"
 msgstr "導入Ver"
 
-#: dselect/pkgdisplay.cc:197
+#: dselect/pkgdisplay.cc
 msgid "dselect - recursive package listing"
 msgstr "dselect - 再帰的パッケージ一覧"
 
-#: dselect/pkgdisplay.cc:199
+#: dselect/pkgdisplay.cc
 msgid "dselect - inspection of package states"
 msgstr "dselect - パッケージ状態の閲覧"
 
-#: dselect/pkgdisplay.cc:200
+#: dselect/pkgdisplay.cc
 msgid "dselect - main package listing"
 msgstr "dselect - パッケージ一覧"
 
-#: dselect/pkgdisplay.cc:208
+#: dselect/pkgdisplay.cc
 msgid " (by section)"
 msgstr "(分類別)"
 
-#: dselect/pkgdisplay.cc:211
+#: dselect/pkgdisplay.cc
 msgid " (avail., section)"
 msgstr "(利用可、分類別)"
 
-#: dselect/pkgdisplay.cc:214
+#: dselect/pkgdisplay.cc
 msgid " (status, section)"
 msgstr "(状態、分類別)"
 
-#: dselect/pkgdisplay.cc:223
+#: dselect/pkgdisplay.cc
 msgid " (by priority)"
 msgstr "(優先度別)"
 
-#: dselect/pkgdisplay.cc:226
+#: dselect/pkgdisplay.cc
 msgid " (avail., priority)"
 msgstr "(利用可、優先度別)"
 
-#: dselect/pkgdisplay.cc:229
+#: dselect/pkgdisplay.cc
 msgid " (status, priority)"
 msgstr "(状態、優先度別)"
 
-#: dselect/pkgdisplay.cc:238
+#: dselect/pkgdisplay.cc
 msgid " (alphabetically)"
 msgstr "(アルファベット順)"
 
-#: dselect/pkgdisplay.cc:241
+#: dselect/pkgdisplay.cc
 msgid " (by availability)"
 msgstr "(利用可別)"
 
-#: dselect/pkgdisplay.cc:244
+#: dselect/pkgdisplay.cc
 msgid " (by status)"
 msgstr "(状態別)"
 
-#: dselect/pkgdisplay.cc:259
+#: dselect/pkgdisplay.cc
 msgid " mark:+/=/- terse:v help:?"
 msgstr "マーク:+/=/- 簡易:v ヘルプ:?"
 
-#: dselect/pkgdisplay.cc:260
+#: dselect/pkgdisplay.cc
 msgid " mark:+/=/- verbose:v help:?"
 msgstr "マーク:+/=/- 詳細:v ヘルプ:?"
 
-#: dselect/pkgdisplay.cc:262
+#: dselect/pkgdisplay.cc
 msgid " terse:v help:?"
 msgstr " 簡易:v ヘルプ:?"
 
-#: dselect/pkgdisplay.cc:263
+#: dselect/pkgdisplay.cc
 msgid " verbose:v help:?"
 msgstr " 詳細:v ヘルプ:?"
 
-#: dselect/pkginfo.cc:85
+#: dselect/pkginfo.cc
 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 "
@@ -1562,76 +1591,106 @@ msgstr ""
 "示されます。`o' および `O' を使用してパッケージソート順を変更し、異なるグ\n"
 "ループに属したパッケージ群にマークを付けることもできます。"
 
-#: dselect/pkginfo.cc:98
+#: dselect/pkginfo.cc
 msgid "Interrelationships"
 msgstr "相互関係"
 
-#: dselect/pkginfo.cc:117
+#: dselect/pkginfo.cc
 msgid "No description available."
 msgstr "説明がありません。"
 
-#: dselect/pkginfo.cc:135
+#: dselect/pkginfo.cc
 msgid "Installed control file information"
 msgstr "導入済みの制御ファイル情報"
 
-#: dselect/pkginfo.cc:151
+#: dselect/pkginfo.cc
 msgid "Available control file information"
 msgstr "利用可能な制御ファイル情報"
 
-#: dselect/pkglist.cc:425
+#: dselect/pkglist.cc
 msgid "there are no packages"
 msgstr "パッケージがありません"
 
-#: dselect/pkglist.cc:521
+#: dselect/pkglist.cc
 msgid "invalid search option given"
 msgstr "無効な検索オプションが指定されました"
 
-#: dselect/pkglist.cc:536
+#: dselect/pkglist.cc
 msgid "error in regular expression"
 msgstr "正規表現エラー"
 
-#: dselect/pkgsublist.cc:111
+#: dselect/pkgsublist.cc
 msgid " does not appear to be available\n"
 msgstr "利用可能ではないようです\n"
 
-#: dselect/pkgsublist.cc:131
+#: dselect/pkgsublist.cc
 msgid " or "
 msgstr " あるいは "
 
-#: dselect/pkgtop.cc:58
+#: dselect/pkgtop.cc
 msgid "All"
 msgstr "すべて"
 
-#: dselect/pkgtop.cc:80
+#: dselect/pkgtop.cc
 msgid "All packages"
 msgstr "全パッケージ"
 
-#: dselect/pkgtop.cc:84
+#: dselect/pkgtop.cc
 #, c-format
 msgid "%s packages without a section"
 msgstr "セクションのない %s パッケージ:"
 
-#: dselect/pkgtop.cc:86
+#: dselect/pkgtop.cc
 #, c-format
 msgid "%s packages in section %s"
 msgstr "%2$s セクションの %1$s パッケージ"
 
-#: dselect/pkgtop.cc:92
+#: dselect/pkgtop.cc
 #, c-format
 msgid "%s %s packages"
 msgstr "%s%s パッケージ"
 
-#: dselect/pkgtop.cc:96
+#: dselect/pkgtop.cc
 #, c-format
 msgid "%s %s packages without a section"
 msgstr "セクションのない %s%s パッケージ"
 
-#: dselect/pkgtop.cc:98
+#: dselect/pkgtop.cc
 #, c-format
 msgid "%s %s packages in section %s"
 msgstr "%3$s セクションの %1$s%2$s パッケージ"
 
-#: dselect/pkgtop.cc:119
+#: dselect/pkgtop.cc
 #, c-format
 msgid "%-*s %s%s%s;  %s (was: %s).  %s"
 msgstr "%-*s %s%s%s;  %s (前回: %s).  %s"
+
+#~ msgid "Actions:\n"
+#~ msgstr "アクション:\n"
+
+#~ msgid "Colours:\n"
+#~ msgstr "色:\n"
+
+#~ msgid "Attributes:\n"
+#~ msgstr "属性:\n"
+
+#~ msgid "EOF before option name start"
+#~ msgstr "オプション名が始まる前に EOF があります"
+
+#~ msgid "EOF before summary"
+#~ msgstr "要約の前に EOF があります"
+
+#~ msgid "!Bug!"
+#~ msgstr "!バグ!"
+
+#~ msgid "Updated"
+#~ msgstr "更新されている"
+
+#~ msgid "Up-to-date"
+#~ msgstr "最新"
+
+#~ msgid "Updated packages (newer version is available)"
+#~ msgstr "更新されているパッケージ (新バージョンが取得可能)"
+
+#~ msgid "Available packages (not currently installed)"
+#~ msgstr "取得可能パッケージ (未インストール)"
diff --git a/dselect/po/ko.po b/dselect/po/ko.po
index 7dc40c803..3bdc42520 100644
--- a/dselect/po/ko.po
+++ b/dselect/po/ko.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dselect 1.17.0\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2014-12-23 18:12+0100\n"
+"POT-Creation-Date: 2015-04-06 09:37+0200\n"
 "PO-Revision-Date: 2007-09-16 22:55-0400\n"
 "Last-Translator: Sunjae Park <darehanl@gmail.com>\n"
 "Language-Team: Korean <debian-l10n-korean@lists.debian.org>\n"
@@ -16,28 +16,28 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: dselect/basecmds.cc:125
+#: dselect/basecmds.cc
 msgid "Search for ? "
 msgstr "무엇을 찾으십니까 ? "
 
-#: dselect/basecmds.cc:149
+#: dselect/basecmds.cc
 msgid "Error: "
 msgstr "오류: "
 
-#: dselect/basecmds.cc:180
+#: dselect/basecmds.cc
 msgid "Help: "
 msgstr "도움말: "
 
-#: dselect/basecmds.cc:186
+#: dselect/basecmds.cc
 msgid "Press ? for help menu, . for next topic, <space> to exit help."
 msgstr ""
 "도움말 메뉴는 ?, 다음 주제는 ., 도움말에서 나가시려면 <space>를 누르십시오."
 
-#: dselect/basecmds.cc:193
+#: dselect/basecmds.cc
 msgid "Help information is available under the following topics:"
 msgstr "다음 주제에 대한 도움말 정보가 있습니다:"
 
-#: dselect/basecmds.cc:201
+#: dselect/basecmds.cc
 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. "
@@ -45,245 +45,245 @@ msgstr ""
 "위의 목록에 따라 키를 누르십시오. 도움말을 나가려면 <space>나 q를,\n"
 "  각 도움말 페이지를 순서대로 읽으려면 . 키를 누르십시오."
 
-#: dselect/basecmds.cc:207
+#: dselect/basecmds.cc
 msgid "error reading keyboard in help"
 msgstr "도움말에서 키보드를 읽는 데 오류가 발생했습니다"
 
-#: dselect/baselist.cc:60
+#: dselect/baselist.cc
 msgid "ioctl(TIOCGWINSZ) failed"
 msgstr "ioctl(TIOCGWINSZ)이 실패했습니다"
 
-#: dselect/baselist.cc:63
+#: dselect/baselist.cc
 msgid "doupdate in SIGWINCH handler failed"
 msgstr "SIGWINCH 핸들러에서 doupdate가 실패했습니다"
 
-#: dselect/baselist.cc:72
+#: dselect/baselist.cc
 msgid "failed to restore old SIGWINCH sigact"
 msgstr "과거의 SIGWINCH 시그널 액션을 복구하는 데 실패했습니다"
 
-#: dselect/baselist.cc:75
+#: dselect/baselist.cc
 msgid "failed to restore old signal mask"
 msgstr "과거의 시그널 마스크를 복구하는 데 실패했습니다"
 
-#: dselect/baselist.cc:86
+#: dselect/baselist.cc
 msgid "failed to get old signal mask"
 msgstr "과거의 시그널 마스크를 얻어 오는 데 실패했습니다"
 
-#: dselect/baselist.cc:88
+#: dselect/baselist.cc
 msgid "failed to get old SIGWINCH sigact"
 msgstr "과거의 SIGWINCH 시그널 액션을 얻어 오는 데 실패했습니다"
 
-#: dselect/baselist.cc:93
+#: dselect/baselist.cc
 msgid "failed to block SIGWINCH"
 msgstr "SIGWINCH을 블록하는 데 실패했습니다"
 
-#: dselect/baselist.cc:99
+#: dselect/baselist.cc
 msgid "failed to set new SIGWINCH sigact"
 msgstr "새 SIGWINCH 시그널 액션을 설정하는 데 실패했습니다"
 
-#: dselect/baselist.cc:174
+#: dselect/baselist.cc
 msgid "failed to allocate colour pair"
 msgstr "글자/바탕 색상 할당이 실패했습니다"
 
-#: dselect/baselist.cc:203
+#: dselect/baselist.cc
 msgid "failed to create title window"
 msgstr "제목 창 만들기가 실패했습니다"
 
-#: dselect/baselist.cc:207
+#: dselect/baselist.cc
 msgid "failed to create whatinfo window"
 msgstr "정보 창 만들기가 실패했습니다"
 
-#: dselect/baselist.cc:211
+#: dselect/baselist.cc
 msgid "failed to create baselist pad"
 msgstr "기본 목록 창 만들기가 실패했습니다"
 
-#: dselect/baselist.cc:214
+#: dselect/baselist.cc
 msgid "failed to create heading pad"
 msgstr "제목 창 만들기가 실패했습니다"
 
-#: dselect/baselist.cc:218
+#: dselect/baselist.cc
 msgid "failed to create thisstate pad"
 msgstr "현재 상태 창 만들기가 실패했습니다"
 
-#: dselect/baselist.cc:222
+#: dselect/baselist.cc
 msgid "failed to create info pad"
 msgstr "정보 창 만들기가 실패했습니다"
 
-#: dselect/baselist.cc:227
+#: dselect/baselist.cc
 msgid "failed to create query window"
 msgstr "질의 창 만들기가 실패했습니다"
 
-#: dselect/baselist.cc:298
+#: dselect/baselist.cc
 msgid "Keybindings"
 msgstr "키바인딩"
 
 # FIXME: bad msgid
-#: dselect/baselist.cc:347
+#: dselect/baselist.cc
 #, c-format
 msgid "  -- %d%%, press "
 msgstr "  -- %d%%, "
 
 # FIXME: bad msgid
-#: dselect/baselist.cc:350
+#: dselect/baselist.cc
 #, c-format
 msgid "%s for more"
 msgstr "더 보려면 %s 키를 누르십시오"
 
 # FIXME: bad msgid
-#: dselect/baselist.cc:354
+#: dselect/baselist.cc
 #, c-format
 msgid "%s to go back"
 msgstr "뒤로 가려면 %s 키를 누르십시오"
 
-#: dselect/bindings.cc:78
+#: dselect/bindings.cc
 msgid "[not bound]"
 msgstr "[정의되지 않음]"
 
-#: dselect/bindings.cc:82
+#: dselect/bindings.cc
 #, c-format
 msgid "[unk: %d]"
 msgstr "[키번호: %d]"
 
-#: dselect/bindings.cc:141
+#: dselect/bindings.cc
 msgid "Scroll onwards through help/information"
 msgstr "도움말/정보를 위로 스크롤"
 
-#: dselect/bindings.cc:142
+#: dselect/bindings.cc
 msgid "Scroll backwards through help/information"
 msgstr "도움말/정보를 아래로 스크롤"
 
-#: dselect/bindings.cc:143
+#: dselect/bindings.cc
 msgid "Move up"
 msgstr "위로"
 
-#: dselect/bindings.cc:144
+#: dselect/bindings.cc
 msgid "Move down"
 msgstr "아래로"
 
-#: dselect/bindings.cc:145
+#: dselect/bindings.cc
 msgid "Go to top of list"
 msgstr "목록의 맨 위로"
 
-#: dselect/bindings.cc:146
+#: dselect/bindings.cc
 msgid "Go to end of list"
 msgstr "목록의 맨 아래로"
 
-#: dselect/bindings.cc:147
+#: dselect/bindings.cc
 msgid "Request help (cycle through help screens)"
 msgstr "도움말 요청 (여러 도움말 화면을 번갈아 가면서 표시)"
 
-#: dselect/bindings.cc:148
+#: dselect/bindings.cc
 msgid "Cycle through information displays"
 msgstr "여러 정보 표시를 번갈아 가면서 표시"
 
-#: dselect/bindings.cc:149
+#: dselect/bindings.cc
 msgid "Redraw display"
 msgstr "화면 다시 그리기"
 
-#: dselect/bindings.cc:150
+#: dselect/bindings.cc
 msgid "Scroll onwards through list by 1 line"
 msgstr "목록을 한 줄 앞으로 스크롤"
 
-#: dselect/bindings.cc:151
+#: dselect/bindings.cc
 msgid "Scroll backwards through list by 1 line"
 msgstr "목록을 한줄 뒤로 스크롤"
 
-#: dselect/bindings.cc:152
+#: dselect/bindings.cc
 msgid "Scroll onwards through help/information by 1 line"
 msgstr "도움말/정보를 한 줄 앞으로 스크롤"
 
-#: dselect/bindings.cc:153
+#: dselect/bindings.cc
 msgid "Scroll backwards through help/information by 1 line"
 msgstr "도움말/정보를 한 줄 뒤로 스크롤"
 
-#: dselect/bindings.cc:154
+#: dselect/bindings.cc
 msgid "Scroll onwards through list"
 msgstr "목록을 앞으로 스크롤"
 
-#: dselect/bindings.cc:155
+#: dselect/bindings.cc
 msgid "Scroll backwards through list"
 msgstr "목록을 뒤로 스크롤"
 
-#: dselect/bindings.cc:158
+#: dselect/bindings.cc
 msgid "Mark package(s) for installation"
 msgstr "설치하는 꾸러미 표시"
 
-#: dselect/bindings.cc:159
+#: dselect/bindings.cc
 msgid "Mark package(s) for deinstallation"
 msgstr "지우는 꾸러미 표시"
 
-#: dselect/bindings.cc:160
+#: dselect/bindings.cc
 msgid "Mark package(s) for deinstall and purge"
 msgstr "지우는 꾸러미 및 깨끗이 할 꾸러미 표시"
 
-#: dselect/bindings.cc:161
+#: dselect/bindings.cc
 msgid "Make highlight more specific"
 msgstr "반전 표시를 더 분명하게"
 
-#: dselect/bindings.cc:162
+#: dselect/bindings.cc
 msgid "Make highlight less specific"
 msgstr "반전 표시를 덜 분명하게"
 
-#: dselect/bindings.cc:163
+#: dselect/bindings.cc
 msgid "Search for a package whose name contains a string"
 msgstr "이름에 특정 문자열이 들어 있는 꾸러미를 찾습니다"
 
-#: dselect/bindings.cc:164
+#: dselect/bindings.cc
 #, fuzzy
 #| msgid "Repeat last search."
 msgid "Repeat last search"
 msgstr "마지막 찾기 반복."
 
-#: dselect/bindings.cc:165
+#: dselect/bindings.cc
 msgid "Swap sort order priority/section"
 msgstr "정렬 순서를 우선순위/섹션으로 바꿈"
 
-#: dselect/bindings.cc:166
+#: dselect/bindings.cc
 msgid "Quit, confirming, and checking dependencies"
 msgstr "끝내기, 확인, 의존성 검사"
 
-#: dselect/bindings.cc:167
+#: dselect/bindings.cc
 msgid "Quit, confirming without check"
 msgstr "끝내기, 검사없이 확인"
 
-#: dselect/bindings.cc:168
+#: dselect/bindings.cc
 msgid "Quit, rejecting conflict/dependency suggestions"
 msgstr "끝내기, 충돌/의존성 제안 거부"
 
-#: dselect/bindings.cc:169
+#: dselect/bindings.cc
 msgid "Abort - quit without making changes"
 msgstr "중단 - 바꾸지 않고 끝내기"
 
-#: dselect/bindings.cc:170
+#: dselect/bindings.cc
 msgid "Revert to old state for all packages"
 msgstr "모든 꾸러미를 이전 상태로 되돌림"
 
-#: dselect/bindings.cc:171
+#: dselect/bindings.cc
 msgid "Revert to suggested state for all packages"
 msgstr "모든 꾸러미를 제안 상태로 되돌림"
 
-#: dselect/bindings.cc:172
+#: dselect/bindings.cc
 msgid "Revert to directly requested state for all packages"
 msgstr "모든 꾸러미를 제안 상태로 직접 되돌림"
 
-#: dselect/bindings.cc:173
+#: dselect/bindings.cc
 #, fuzzy
 msgid "Revert to currently installed state for all packages"
 msgstr "모든 꾸러미를 제안 상태로 직접 되돌림"
 
-#: dselect/bindings.cc:176
+#: dselect/bindings.cc
 msgid "Select currently-highlighted access method"
 msgstr "현재 반전된 설치 방법을 선택"
 
-#: dselect/bindings.cc:177
+#: dselect/bindings.cc
 msgid "Quit without changing selected access method"
 msgstr "선택한 설치 방법을 바꾸지 않고 종료"
 
-#: dselect/helpmsgs.cc:29
+#: dselect/helpmsgs.cc
 msgid "Keystrokes"
 msgstr "키 입력"
 
-#: dselect/helpmsgs.cc:29
+#: dselect/helpmsgs.cc
 #, fuzzy
 #| msgid ""
 #| "Motion keys: Next/Previous, Top/End, Up/Down, Backwards/Forwards:\n"
@@ -374,11 +374,11 @@ msgstr ""
 "   U     모두 제안하는 상태로                   /   찾기 (취소하려면 엔터)\n"
 "   D     모두 직접 요청된 상태로                \\  마지막 찾기 반복\n"
 
-#: dselect/helpmsgs.cc:55
+#: dselect/helpmsgs.cc
 msgid "Introduction to package selections"
 msgstr "꾸러미 선택에 관한 안내"
 
-#: dselect/helpmsgs.cc:55
+#: dselect/helpmsgs.cc
 msgid ""
 "Welcome to dselect's main package listing.\n"
 "\n"
@@ -431,11 +431,11 @@ msgstr ""
 "\n"
 "<space>를 누르시면 도움말을 나가서 꾸러미 목록으로 들어갑니다.\n"
 
-#: dselect/helpmsgs.cc:80
+#: dselect/helpmsgs.cc
 msgid "Introduction to read-only package list browser"
 msgstr "꾸러미 목록 읽기 전용 브라우저 소개"
 
-#: dselect/helpmsgs.cc:80
+#: dselect/helpmsgs.cc
 msgid ""
 "Welcome to dselect's main package listing.\n"
 "\n"
@@ -470,11 +470,11 @@ msgstr ""
 "\n"
 "도움말을 종료하고 목록으로 들아가려면 <space>를 누르십시오.\n"
 
-#: dselect/helpmsgs.cc:99
+#: dselect/helpmsgs.cc
 msgid "Introduction to conflict/dependency resolution sub-list"
 msgstr "충돌/의존성 해결 하위 목록 소개"
 
-#: dselect/helpmsgs.cc:99
+#: dselect/helpmsgs.cc
 msgid ""
 "Dependency/conflict resolution - introduction.\n"
 "\n"
@@ -537,11 +537,11 @@ msgstr ""
 "도움말에서 빠져나가서 하위 목록으로 들어가려면 <space>를 누르십시오.\n"
 "기억하세요.  도움이 필요하면 `?'키를 누르십시오.\n"
 
-#: dselect/helpmsgs.cc:125
+#: dselect/helpmsgs.cc
 msgid "Display, part 1: package listing and status chars"
 msgstr "화면 구성 첫번째: 꾸러미 목록 및 상태를 나타내는 문자"
 
-#: dselect/helpmsgs.cc:125
+#: dselect/helpmsgs.cc
 #, fuzzy
 msgid ""
 "The top half of the screen shows a list of packages.  For each package you "
@@ -600,11 +600,11 @@ msgstr ""
 "각 꾸러미의 우선순위, 섹션, 이름, 설치된 버전과 사용 가능한 버전 (shift-V를\n"
 "누르면 보이기/숨기기) 및 요약된 설명을 표시합니다.\n"
 
-#: dselect/helpmsgs.cc:152
+#: dselect/helpmsgs.cc
 msgid "Display, part 2: list highlight; information display"
 msgstr "화면 구성 두번째: 반전 막대, 정보 표시"
 
-#: dselect/helpmsgs.cc:152
+#: dselect/helpmsgs.cc
 msgid ""
 "* Highlight: One line in the package list will be highlighted.  It "
 "indicates\n"
@@ -653,11 +653,11 @@ msgstr ""
 "이\n"
 "  화면을 감추거나 정보 창을 크게 표시할 수도 있습니다.\n"
 
-#: dselect/helpmsgs.cc:176
+#: dselect/helpmsgs.cc
 msgid "Introduction to method selection display"
 msgstr "설치 방법 선택, 화면 구성 소개"
 
-#: dselect/helpmsgs.cc:176
+#: dselect/helpmsgs.cc
 msgid ""
 "dselect and dpkg can do automatic installation, loading the package files to "
 "be\n"
@@ -696,11 +696,11 @@ msgstr ""
 "키 입력에 관한 설명을 보시려면 `k'를 누르시고, 도움말 메뉴를 보려면 `?'를\n"
 "누르십시오.\n"
 
-#: dselect/helpmsgs.cc:196
+#: dselect/helpmsgs.cc
 msgid "Keystrokes for method selection"
 msgstr "설치 방법 선택, 키 입력"
 
-#: dselect/helpmsgs.cc:196
+#: dselect/helpmsgs.cc
 msgid ""
 "Motion keys: Next/Previous, Top/End, Up/Down, Backwards/Forwards:\n"
 "  j, Down-arrow         k, Up-arrow             move highlight\n"
@@ -750,104 +750,104 @@ msgstr ""
 "  /                찾기 (취소하려면 그냥 Return을 누르십시오)\n"
 "  \\                마지막 찾기 반복\n"
 
-#: dselect/main.cc:63
+#: dselect/main.cc
 msgid "Type dselect --help for help."
 msgstr "도움말이 필요하면 dselect --help를 실행하십시오."
 
-#: dselect/main.cc:145
+#: dselect/main.cc
 msgid "a"
 msgstr "a"
 
-#: dselect/main.cc:145
+#: dselect/main.cc
 msgid "[A]ccess"
 msgstr "설치방법(A)"
 
-#: dselect/main.cc:145
+#: dselect/main.cc
 msgid "Choose the access method to use."
 msgstr "설치 방법을 선택합니다."
 
-#: dselect/main.cc:146
+#: dselect/main.cc
 msgid "u"
 msgstr "u"
 
-#: dselect/main.cc:146
+#: dselect/main.cc
 msgid "[U]pdate"
 msgstr "업데이트(U)"
 
-#: dselect/main.cc:146
+#: dselect/main.cc
 msgid "Update list of available packages, if possible."
 msgstr "이용 가능한 꾸러미 목록을 업데이트합니다."
 
-#: dselect/main.cc:147
+#: dselect/main.cc
 msgid "s"
 msgstr "s"
 
-#: dselect/main.cc:147
+#: dselect/main.cc
 msgid "[S]elect"
 msgstr "선택(S)"
 
-#: dselect/main.cc:147
+#: dselect/main.cc
 msgid "Request which packages you want on your system."
 msgstr "시스템에 설치하려는 꾸러미를 선택합니다."
 
-#: dselect/main.cc:148
+#: dselect/main.cc
 msgid "i"
 msgstr "i"
 
-#: dselect/main.cc:148
+#: dselect/main.cc
 msgid "[I]nstall"
 msgstr "설치(I)"
 
-#: dselect/main.cc:148
+#: dselect/main.cc
 msgid "Install and upgrade wanted packages."
 msgstr "선택한 꾸러미를 설치하고 업그레이드합니다."
 
-#: dselect/main.cc:149
+#: dselect/main.cc
 msgid "c"
 msgstr "c"
 
-#: dselect/main.cc:149
+#: dselect/main.cc
 msgid "[C]onfig"
 msgstr "설정(C)"
 
-#: dselect/main.cc:149
+#: dselect/main.cc
 msgid "Configure any packages that are unconfigured."
 msgstr "설정하지 않은 꾸러미를 설정합니다."
 
-#: dselect/main.cc:150
+#: dselect/main.cc
 msgid "r"
 msgstr "r"
 
-#: dselect/main.cc:150
+#: dselect/main.cc
 msgid "[R]emove"
 msgstr "지우기(R)"
 
-#: dselect/main.cc:150
+#: dselect/main.cc
 msgid "Remove unwanted software."
 msgstr "원하지 않는 꾸러미를 지웁니다."
 
-#: dselect/main.cc:151
+#: dselect/main.cc
 msgid "q"
 msgstr "q"
 
-#: dselect/main.cc:151
+#: dselect/main.cc
 msgid "[Q]uit"
 msgstr "끝내기(Q)"
 
-#: dselect/main.cc:151
+#: dselect/main.cc
 msgid "Quit dselect."
 msgstr "dselect를 끝냅니다."
 
-#: dselect/main.cc:152
+#: dselect/main.cc
 msgid "menu"
 msgstr "메뉴"
 
-#: dselect/main.cc:157
+#: dselect/main.cc
 #, c-format
 msgid "Debian `%s' package handling frontend version %s.\n"
 msgstr "데비안 `%s' 꾸러미 처리 프론트엔드 버전 %s.\n"
 
-#: dselect/main.cc:160
+#: dselect/main.cc
 #, fuzzy
 msgid ""
 "This is free software; see the GNU General Public License version 2 or\n"
@@ -857,20 +857,28 @@ msgstr ""
 "version 2이상을 보십시오. 어떤 보증도 하지 않습니다.\n"
 "저작권 관련 정보를 보려면 %s --licence를 참고하십시오.\n"
 
-#: dselect/main.cc:169 dselect/main.cc:217
+#: dselect/main.cc
 msgid "<standard output>"
 msgstr ""
 
-#: dselect/main.cc:180
-#, c-format
+#: dselect/main.cc
+#, fuzzy, c-format
+#| msgid ""
+#| "Usage: %s [<option> ...] [<action> ...]\n"
+#| "\n"
 msgid ""
-"Usage: %s [<option> ...] [<action> ...]\n"
+"Usage: %s [<option>...] [<command>...]\n"
 "\n"
 msgstr ""
 "사용법: %s [<option> ...] [<action> ...]\n"
 "\n"
 
-#: dselect/main.cc:184
+#: dselect/main.cc
+#, c-format
+msgid "Commands:\n"
+msgstr ""
+
+#: dselect/main.cc
 #, fuzzy, c-format
 #| msgid ""
 #| "Options:\n"
@@ -884,12 +892,12 @@ msgstr ""
 #| "\n"
 msgid ""
 "Options:\n"
-"  --admindir <directory>     Use <directory> instead of %s.\n"
-"  --expert                   Turn on expert mode.\n"
-"  --debug <file> | -D<file>  Turn on debugging, sending output to <file>.\n"
-"  --colour | --color screenpart:[foreground],[background][:attr[+attr+...]]\n"
-"                             Configure screen colours.\n"
-"\n"
+"      --admindir <directory>       Use <directory> instead of %s.\n"
+"      --expert                     Turn on expert mode.\n"
+"  -D, --debug <file>               Turn on debugging, send output to "
+"<file>.\n"
+"      --color <color-spec>         Configure screen colors.\n"
+"      --colour <color-spec>        Ditto.\n"
 msgstr ""
 "옵션:\n"
 "  --admindir <directory>     %s 대신 <directory> 사용.\n"
@@ -899,11 +907,11 @@ msgstr ""
 "                             화면색 설정.\n"
 "\n"
 
-#: dselect/main.cc:193
+#: dselect/main.cc
 #, fuzzy, c-format
 msgid ""
-"  --help                     Show this help message.\n"
-"  --version                  Show the version.\n"
+"  -?, --help                       Show this help message.\n"
+"      --version                    Show the version.\n"
 "\n"
 msgstr ""
 "  --help                     이 도움말 메시지 봄.\n"
@@ -911,65 +919,67 @@ msgstr ""
 "  --license | --licence      저작권 관련 정보를 봄.\n"
 "\n"
 
-#: dselect/main.cc:197
-#, fuzzy, c-format
-#| msgid "Section"
-msgid "Actions:\n"
-msgstr "섹션"
-
-#: dselect/main.cc:202
+#: dselect/main.cc
 #, c-format
-msgid "Screenparts:\n"
+msgid ""
+"<color-spec> is <screen-part>:[<foreground>],[<background>][:"
+"<attr>[+<attr>]...]\n"
+msgstr ""
+
+#: dselect/main.cc
+#, fuzzy, c-format
+#| msgid "Screenparts:\n"
+msgid "<screen-part> is:"
 msgstr "화면 구성 요소:\n"
 
-#: dselect/main.cc:207
+#: dselect/main.cc
 #, c-format
-msgid "Colours:\n"
-msgstr "색:\n"
+msgid "<color> is:"
+msgstr ""
 
-#: dselect/main.cc:212
+#: dselect/main.cc
 #, c-format
-msgid "Attributes:\n"
-msgstr "속성:\n"
+msgid "<attr> is:"
+msgstr ""
 
-#: dselect/main.cc:232
+#: dselect/main.cc
 #, c-format
 msgid "couldn't open debug file `%.255s'\n"
 msgstr "디버그 파일 `%.255s'을(를) 열 수 없습니다\n"
 
-#: dselect/main.cc:253
+#: dselect/main.cc
 #, fuzzy, c-format
 #| msgid "Invalid %s `%s'\n"
 msgid "invalid %s '%s'"
 msgstr "올바르지 않은 %s `%s'\n"
 
-#: dselect/main.cc:272
+#: dselect/main.cc
 msgid "screen part"
 msgstr "화면 구성 요소"
 
-#: dselect/main.cc:278
+#: dselect/main.cc
 #, fuzzy
 #| msgid "Null colour specification\n"
 msgid "null colour specification"
 msgstr "색 지정이 없습니다\n"
 
-#: dselect/main.cc:286 dselect/main.cc:291
+#: dselect/main.cc
 msgid "colour"
 msgstr "색"
 
-#: dselect/main.cc:299
+#: dselect/main.cc
 msgid "colour attribute"
 msgstr "색 속성"
 
-#: dselect/main.cc:333
+#: dselect/main.cc
 msgid "Terminal does not appear to support cursor addressing.\n"
 msgstr "터미널이 커서 주소 지정을 지원하지 않는 것 같습니다.\n"
 
-#: dselect/main.cc:335
+#: dselect/main.cc
 msgid "Terminal does not appear to support highlighting.\n"
 msgstr "터미널이 반전을 지원하지 않는 것 같습니다.\n"
 
-#: dselect/main.cc:337
+#: dselect/main.cc
 #, c-format
 msgid ""
 "Set your TERM variable correctly, use a better terminal,\n"
@@ -978,11 +988,11 @@ msgstr ""
 "TERM 변수를 정확히 설정하든지 더 나은 터미널을 사용하든지,\n"
 "각 꾸러미 별로 개별적인 관리 도구 %s 이용하십시오.\n"
 
-#: dselect/main.cc:340
+#: dselect/main.cc
 msgid "terminal lacks necessary features, giving up"
 msgstr "터미널에 필수적인 기능이 빠져 있습니다. 그만둡니다."
 
-#: dselect/main.cc:425
+#: dselect/main.cc
 msgid ""
 "\n"
 "\n"
@@ -996,7 +1006,7 @@ msgstr ""
 "선택한 항목으로 들어가려면 <enter> 키를 누르십시오.   ^L은 화면을 다시 그립니"
 "다.\n"
 
-#: dselect/main.cc:430
+#: dselect/main.cc
 msgid ""
 "Copyright (C) 1994-1996 Ian Jackson.\n"
 "Copyright (C) 2000,2001 Wichert Akkerman.\n"
@@ -1004,7 +1014,7 @@ msgstr ""
 "Copyright (C) 1994-1996 Ian Jackson.\n"
 "Copyright (C) 2000,2001 Wichert Akkerman.\n"
 
-#: dselect/main.cc:436
+#: dselect/main.cc
 msgid ""
 "\n"
 "\n"
@@ -1014,57 +1024,57 @@ msgstr ""
 "\n"
 "읽기 전용 접근: 선택된 사항을 미리 보는 것만 가능합니다!"
 
-#: dselect/main.cc:455
+#: dselect/main.cc
 msgid "failed to getch in main menu"
 msgstr "주 메뉴에서 getch가 실패했습니다"
 
-#: dselect/main.cc:538
+#: dselect/main.cc
 #, c-format
 msgid "unknown action string `%.50s'"
 msgstr "알 수 없는 명령 문자열 `%.50s'"
 
-#: dselect/methlist.cc:66
+#: dselect/methlist.cc
 msgid "Abbrev."
 msgstr "약어"
 
-#: dselect/methlist.cc:67 dselect/pkgdisplay.cc:188 dselect/pkginfo.cc:110
+#: dselect/methlist.cc dselect/pkgdisplay.cc dselect/pkginfo.cc
 msgid "Description"
 msgstr "설명"
 
-#: dselect/methlist.cc:73
+#: dselect/methlist.cc
 msgid "dselect - list of access methods"
 msgstr "dselect - 설치 방법 목록"
 
-#: dselect/methlist.cc:82
+#: dselect/methlist.cc
 #, c-format
 msgid "Access method `%s'."
 msgstr "설치 방법 `%s'."
 
-#: dselect/methlist.cc:161 dselect/pkglist.cc:587
+#: dselect/methlist.cc dselect/pkglist.cc
 msgid "doupdate failed"
 msgstr "doupdate가 실패했습니다"
 
-#: dselect/methlist.cc:164 dselect/pkglist.cc:590
+#: dselect/methlist.cc dselect/pkglist.cc
 msgid "failed to unblock SIGWINCH"
 msgstr "SIGWINCH 시그널의 블록을 해제하는 데 실패했습니다"
 
-#: dselect/methlist.cc:169 dselect/pkglist.cc:595
+#: dselect/methlist.cc dselect/pkglist.cc
 msgid "failed to re-block SIGWINCH"
 msgstr "SIGWINCH 시그널을 블록을 다시 설정하는 데 실패했습니다"
 
-#: dselect/methlist.cc:170 dselect/pkglist.cc:597
+#: dselect/methlist.cc dselect/pkglist.cc
 msgid "getch failed"
 msgstr "getch가 실패했습니다"
 
-#: dselect/methlist.cc:187
+#: dselect/methlist.cc
 msgid "Explanation"
 msgstr "설명"
 
-#: dselect/methlist.cc:197
+#: dselect/methlist.cc
 msgid "No explanation available."
 msgstr "설명 없습니다."
 
-#: dselect/method.cc:67
+#: dselect/method.cc
 #, c-format
 msgid ""
 "\n"
@@ -1075,7 +1085,7 @@ msgstr ""
 "\n"
 "%s: %s\n"
 
-#: dselect/method.cc:70
+#: dselect/method.cc
 msgid ""
 "\n"
 "Press <enter> to continue."
@@ -1083,193 +1093,203 @@ msgstr ""
 "\n"
 "계속하려면 <enter> 키를 누르십시오."
 
-#: dselect/method.cc:82
+#: dselect/method.cc
 msgid "cannot unlock access method area"
 msgstr ""
 
 # FIXME: bad msgid
-#: dselect/method.cc:96
+#: dselect/method.cc
 #, fuzzy
 #| msgid " does not appear to be available\n"
 msgid "no access methods are available"
 msgstr " 꾸러미는 이용할 수 없는 것으로 보입니다\n"
 
-#: dselect/method.cc:115
+#: dselect/method.cc
 msgid "requested operation requires superuser privilege"
 msgstr ""
 
-#: dselect/method.cc:118
+#: dselect/method.cc
 #, fuzzy
 #| msgid "Choose the access method to use."
 msgid "cannot open or create access method lockfile"
 msgstr "설치 방법을 선택합니다."
 
-#: dselect/method.cc:125
+#: dselect/method.cc
 msgid "the access method area is already locked"
 msgstr ""
 
-#: dselect/method.cc:128
+#: dselect/method.cc
 #, fuzzy
 #| msgid "dselect - list of access methods"
 msgid "cannot lock access method area"
 msgstr "dselect - 설치 방법 목록"
 
-#: dselect/method.cc:161
+#: dselect/method.cc
 #, c-format
 msgid "Press <enter> to continue.\n"
 msgstr "계속하려면 <enter> 키를 누르십시오.\n"
 
-#: dselect/method.cc:162
+#: dselect/method.cc
 #, fuzzy
 msgid "<standard error>"
 msgstr "표준 오류에 쓰기 오류가 발생했습니다"
 
-#: dselect/method.cc:165
+#: dselect/method.cc
 msgid "error reading acknowledgement of program failure message"
 msgstr "프로그램 실패 메세지의 확인을 읽는 데 오류가 발생했습니다"
 
-#: dselect/method.cc:187
+#: dselect/method.cc
 msgid "no access method is selected or configured"
 msgstr ""
 
-#: dselect/method.cc:196
+#: dselect/method.cc
 msgid "update available list script"
 msgstr "사용 가능 목록 업데이트 스크립트"
 
-#: dselect/method.cc:200
+#: dselect/method.cc
 msgid "installation script"
 msgstr "설치 스크립트"
 
-#: dselect/method.cc:246
+#: dselect/method.cc
 msgid "query/setup script"
 msgstr "찾기/설정 스크립트"
 
-#: dselect/methparse.cc:53
+#: dselect/methparse.cc
 #, c-format
 msgid "syntax error in method options file `%.250s' -- %s"
 msgstr "설치 방법 옵션 파일 `%.250s'에 문법 오류가 있습니다 -- %s"
 
-#: dselect/methparse.cc:59
+#: dselect/methparse.cc
 #, c-format
 msgid "error reading options file `%.250s'"
 msgstr "옵션 파일 `%.250s'을(를) 읽는 데 오류가 발생했습니다"
 
-#: dselect/methparse.cc:93
+#: dselect/methparse.cc
 #, c-format
 msgid "unable to read `%.250s' directory for reading methods"
 msgstr "설치 방법을 읽는 데 `%.250s' 디렉토리를 읽을 수 없습니다"
 
-#: dselect/methparse.cc:109
+#: dselect/methparse.cc
 #, c-format
 msgid "method `%.250s' has name that is too long (%d > %d characters)"
 msgstr "`%.250s' 설치 방법에 너무 긴 이름이 들어 있습니다 (%d > %d 바이트)"
 
-#: dselect/methparse.cc:120
+#: dselect/methparse.cc
 #, c-format
 msgid "unable to access method script `%.250s'"
 msgstr "설치 방법 스크립트 `%.250s'에 접근할 수 없습니다"
 
-#: dselect/methparse.cc:126
+#: dselect/methparse.cc
 #, c-format
 msgid "unable to read method options file `%.250s'"
 msgstr "설치 방법 옵션 파일 `%.250s'을(를) 읽을 수 없습니다"
 
-#: dselect/methparse.cc:150
+#: dselect/methparse.cc
 msgid "non-digit where digit wanted"
 msgstr "숫자가 들어가야 할 곳에 숫자가 아닌 문자"
 
-#: dselect/methparse.cc:153
-msgid "EOF in index string"
+#: dselect/methparse.cc
+#, fuzzy
+#| msgid "EOF in index string"
+msgid "end of file in index string"
 msgstr "인덱스 문자열에서 파일이 끝났습니다"
 
-#: dselect/methparse.cc:156
+#: dselect/methparse.cc
 msgid "index string too long"
 msgstr "인덱스 문자열이 너무 깁니다"
 
-#: dselect/methparse.cc:159
+#: dselect/methparse.cc
 msgid "newline before option name start"
 msgstr "옵션 이름이 시작하기 전에 줄바꿈이 있습니다"
 
-#: dselect/methparse.cc:161
-msgid "EOF before option name start"
-msgstr "옵션 이름이 시작하기 전에 파일이 끝났습니다"
+#: dselect/methparse.cc
+#, fuzzy
+#| msgid "newline before option name start"
+msgid "end of file before option name start"
+msgstr "옵션 이름이 시작하기 전에 줄바꿈이 있습니다"
 
-#: dselect/methparse.cc:165
+#: dselect/methparse.cc
 msgid "nonalpha where option name start wanted"
 msgstr "원하는 옵션 이름이 시작되는 곳에 영문자가 아닌 문자가 있습니다"
 
-#: dselect/methparse.cc:167
+#: dselect/methparse.cc
 msgid "non-alphanum in option name"
 msgstr "옵션 이름에 영문자나 숫자가 아닌 문자가 있습니다"
 
-#: dselect/methparse.cc:170
-msgid "EOF in option name"
+#: dselect/methparse.cc
+#, fuzzy
+#| msgid "EOF in option name"
+msgid "end of file in option name"
 msgstr "옵션 이름 중에 파일이 끝났습니다"
 
-#: dselect/methparse.cc:175
+#: dselect/methparse.cc
 msgid "newline before summary"
 msgstr "요약 전에 줄바꿈 문자가 있습니다"
 
-#: dselect/methparse.cc:177
-msgid "EOF before summary"
-msgstr "요약 전에 파일이 끝났습니다"
+#: dselect/methparse.cc
+#, fuzzy
+#| msgid "newline before summary"
+msgid "end of file before summary"
+msgstr "요약 전에 줄바꿈 문자가 있습니다"
 
-#: dselect/methparse.cc:183
-msgid "EOF in summary - missing newline"
+#: dselect/methparse.cc
+#, fuzzy
+#| msgid "EOF in summary - missing newline"
+msgid "end of file in summary - missing newline"
 msgstr "요약에 파일이 끝났습니다 - 줄바꿈이 빠졌습니다"
 
-#: dselect/methparse.cc:193
+#: dselect/methparse.cc
 #, c-format
 msgid "unable to open option description file `%.250s'"
 msgstr "옵션 설명 파일(`%.250s')을 열 수 없습니다"
 
-#: dselect/methparse.cc:197
+#: dselect/methparse.cc
 #, c-format
 msgid "unable to stat option description file `%.250s'"
 msgstr "옵션 설명 파일(`%.250s')의 정보를 읽을 수 없습니다"
 
-#: dselect/methparse.cc:201
+#: dselect/methparse.cc
 #, c-format
 msgid "failed to read option description file `%.250s'"
 msgstr "옵션 설명 파일(`%.250s')을 열 수 없습니다"
 
-#: dselect/methparse.cc:204
+#: dselect/methparse.cc
 #, c-format
 msgid "error during read of option description file `%.250s'"
 msgstr "옵션 설명 파일(`%.250s')을 읽는 중에 오류"
 
-#: dselect/methparse.cc:227
+#: dselect/methparse.cc
 #, c-format
 msgid "error during read of method options file `%.250s'"
 msgstr "설치 방법 옵션 파일(`%.250s')을 읽는 중에 오류"
 
-#: dselect/methparse.cc:250
+#: dselect/methparse.cc
 #, c-format
 msgid "unable to open current option file `%.250s'"
 msgstr "현재 옵션 파일(`%.250s')을 열 수 없습니다"
 
-#: dselect/methparse.cc:286
+#: dselect/methparse.cc
 #, c-format
 msgid "unable to write new option to `%.250s'"
 msgstr "새 옵션 파일(`%.250s')을 쓸 수 없습니다"
 
-#: dselect/pkgdisplay.cc:36
+#: dselect/pkgdisplay.cc
 msgid "new package"
 msgstr "새 꾸러미"
 
-#: dselect/pkgdisplay.cc:37
+#: dselect/pkgdisplay.cc
 msgid "install"
 msgstr "설치"
 
-#: dselect/pkgdisplay.cc:38
+#: dselect/pkgdisplay.cc
 msgid "hold"
 msgstr "고정"
 
-#: dselect/pkgdisplay.cc:39
+#: dselect/pkgdisplay.cc
 msgid "remove"
 msgstr "지우기"
 
-#: dselect/pkgdisplay.cc:40
+#: dselect/pkgdisplay.cc
 msgid "purge"
 msgstr "깨끗이"
 
@@ -1277,332 +1297,326 @@ msgstr "깨끗이"
 #. * the empty string to store information about the translation. DO NOT
 #. * CHANGE THAT IN A TRANSLATION! The code really relies on that being
 #. * a single space.
-#: dselect/pkgdisplay.cc:47
+#: dselect/pkgdisplay.cc
 msgid " "
 msgstr " "
 
-#: dselect/pkgdisplay.cc:48
+#: dselect/pkgdisplay.cc
 msgid "REINSTALL"
 msgstr "다시설치"
 
-#: dselect/pkgdisplay.cc:51
+#: dselect/pkgdisplay.cc
 msgid "not installed"
 msgstr "설치하지 않았습니다"
 
-#: dselect/pkgdisplay.cc:52
+#: dselect/pkgdisplay.cc
 msgid "removed (configs remain)"
 msgstr "지움 (설정 파일 남아있음)"
 
-#: dselect/pkgdisplay.cc:53
+#: dselect/pkgdisplay.cc
 msgid "half installed"
 msgstr "일부 설치"
 
-#: dselect/pkgdisplay.cc:54
+#: dselect/pkgdisplay.cc
 msgid "unpacked (not set up)"
 msgstr "풀림 (설정하지는 않음)"
 
-#: dselect/pkgdisplay.cc:55
+#: dselect/pkgdisplay.cc
 msgid "half configured (config failed)"
 msgstr ""
 
-#: dselect/pkgdisplay.cc:56
+#: dselect/pkgdisplay.cc
 msgid "awaiting trigger processing"
 msgstr ""
 
-#: dselect/pkgdisplay.cc:57
+#: dselect/pkgdisplay.cc
 msgid "triggered"
 msgstr ""
 
-#: dselect/pkgdisplay.cc:58
+#: dselect/pkgdisplay.cc
 msgid "installed"
 msgstr "설치함"
 
-#: dselect/pkgdisplay.cc:61
+#: dselect/pkgdisplay.cc
 msgid "Required"
 msgstr "필수"
 
-#: dselect/pkgdisplay.cc:62
+#: dselect/pkgdisplay.cc
 msgid "Important"
 msgstr "중요"
 
-#: dselect/pkgdisplay.cc:63
+#: dselect/pkgdisplay.cc
 msgid "Standard"
 msgstr "표준"
 
-#: dselect/pkgdisplay.cc:64
+#: dselect/pkgdisplay.cc
 msgid "Optional"
 msgstr "옵션"
 
-#: dselect/pkgdisplay.cc:65
+#: dselect/pkgdisplay.cc
 msgid "Extra"
 msgstr "별도"
 
-#: dselect/pkgdisplay.cc:66
-msgid "!Bug!"
-msgstr "!버그!"
-
-#: dselect/pkgdisplay.cc:67
+#: dselect/pkgdisplay.cc
 msgid "Unclassified"
 msgstr "분류안됨"
 
-#: dselect/pkgdisplay.cc:70
+#: dselect/pkgdisplay.cc
 msgid "suggests"
 msgstr "꾸러미는 다음 꾸러미를 제안:"
 
-#: dselect/pkgdisplay.cc:71
+#: dselect/pkgdisplay.cc
 msgid "recommends"
 msgstr "꾸러미는 다음 꾸러미를 추천:"
 
-#: dselect/pkgdisplay.cc:72
+#: dselect/pkgdisplay.cc
 msgid "depends on"
 msgstr "꾸러미는 다음 꾸러미에 의존:"
 
-#: dselect/pkgdisplay.cc:73
+#: dselect/pkgdisplay.cc
 msgid "pre-depends on"
 msgstr "꾸러미는 다음 꾸러미에 선의존:"
 
-#: dselect/pkgdisplay.cc:74
+#: dselect/pkgdisplay.cc
 #, fuzzy
 msgid "breaks"
 msgstr "망가뜨림"
 
-#: dselect/pkgdisplay.cc:75
+#: dselect/pkgdisplay.cc
 msgid "conflicts with"
 msgstr "꾸러미는 다음 꾸러미와 충돌:"
 
-#: dselect/pkgdisplay.cc:76
+#: dselect/pkgdisplay.cc
 msgid "provides"
 msgstr "꾸러미는 다음 꾸러미의 기능을 제공:"
 
-#: dselect/pkgdisplay.cc:77
+#: dselect/pkgdisplay.cc
 msgid "replaces"
 msgstr "꾸러미는 다음 꾸러미를 대치:"
 
-#: dselect/pkgdisplay.cc:78
+#: dselect/pkgdisplay.cc
 msgid "enhances"
 msgstr "꾸러미는 다음 꾸러미를 확장:"
 
-#: dselect/pkgdisplay.cc:81
+#: dselect/pkgdisplay.cc
 msgid "Req"
 msgstr "필수"
 
-#: dselect/pkgdisplay.cc:82
+#: dselect/pkgdisplay.cc
 msgid "Imp"
 msgstr "중요"
 
-#: dselect/pkgdisplay.cc:83
+#: dselect/pkgdisplay.cc
 msgid "Std"
 msgstr "표준"
 
-#: dselect/pkgdisplay.cc:84
+#: dselect/pkgdisplay.cc
 msgid "Opt"
 msgstr "옵션"
 
-#: dselect/pkgdisplay.cc:85
+#: dselect/pkgdisplay.cc
 msgid "Xtr"
 msgstr "별도"
 
-#: dselect/pkgdisplay.cc:86
+#: dselect/pkgdisplay.cc
 msgid "bUG"
 msgstr "버그"
 
-#: dselect/pkgdisplay.cc:87
+#: dselect/pkgdisplay.cc
 msgid "?"
 msgstr "?"
 
-#: dselect/pkgdisplay.cc:95 dselect/pkgdisplay.cc:115
+#: dselect/pkgdisplay.cc
 msgid "Broken"
 msgstr "깨짐"
 
-#: dselect/pkgdisplay.cc:96
+#: dselect/pkgdisplay.cc
 msgid "New"
 msgstr "새로움"
 
-#: dselect/pkgdisplay.cc:97
-msgid "Updated"
-msgstr "업데이트한"
+#: dselect/pkgdisplay.cc
+msgid "Upgradable"
+msgstr ""
 
-#: dselect/pkgdisplay.cc:98
+#: dselect/pkgdisplay.cc
 msgid "Obsolete/local"
 msgstr "과거/로컬"
 
-#: dselect/pkgdisplay.cc:99
-msgid "Up-to-date"
-msgstr "최신"
+#: dselect/pkgdisplay.cc
+msgid "Installed"
+msgstr "설치됨"
 
-#: dselect/pkgdisplay.cc:100
+#: dselect/pkgdisplay.cc
 msgid "Available"
 msgstr "이용가능"
 
-#: dselect/pkgdisplay.cc:101 dselect/pkgdisplay.cc:117
+#: dselect/pkgdisplay.cc
 msgid "Removed"
 msgstr "지움"
 
-#: dselect/pkgdisplay.cc:102 dselect/pkgdisplay.cc:111
+#: dselect/pkgdisplay.cc
 msgid "Brokenly installed packages"
 msgstr "깨져서 설치된 꾸러미"
 
-#: dselect/pkgdisplay.cc:103
+#: dselect/pkgdisplay.cc
 msgid "Newly available packages"
 msgstr "새롭게 이용가능한 꾸러미"
 
-#: dselect/pkgdisplay.cc:104
-msgid "Updated packages (newer version is available)"
-msgstr "업데이트한 꾸러미 (새로운 버전이 있음)"
+#: dselect/pkgdisplay.cc
+#, fuzzy
+#| msgid "Newly available packages"
+msgid "Upgradable packages"
+msgstr "새롭게 이용가능한 꾸러미"
 
-#: dselect/pkgdisplay.cc:105
-msgid "Obsolete and local packages present on system"
+#: dselect/pkgdisplay.cc
+#, fuzzy
+#| msgid "Obsolete and local packages present on system"
+msgid "Obsolete and locally created packages"
 msgstr "시스템에 있지만 오래전 꾸러미 및 로컬 꾸러미"
 
-#: dselect/pkgdisplay.cc:106
-msgid "Up to date installed packages"
-msgstr "업데이트해 설치된 꾸러미"
+#: dselect/pkgdisplay.cc
+msgid "Installed packages"
+msgstr "설치한 꾸러미"
 
-#: dselect/pkgdisplay.cc:107
-msgid "Available packages (not currently installed)"
-msgstr "이용 가능한 꾸러미 (아직 설치되지 않음)"
+#: dselect/pkgdisplay.cc
+#, fuzzy
+#| msgid "Up to date installed packages"
+msgid "Available not installed packages"
+msgstr "업데이트해 설치된 꾸러미"
 
-#: dselect/pkgdisplay.cc:108
+#: dselect/pkgdisplay.cc
 msgid "Removed and no longer available packages"
 msgstr "지워서 더 이상 이용할 수 없는 꾸러미"
 
-#: dselect/pkgdisplay.cc:112
-msgid "Installed packages"
-msgstr "설치한 꾸러미"
-
-#: dselect/pkgdisplay.cc:113
+#: dselect/pkgdisplay.cc
 msgid "Removed packages (configuration still present)"
 msgstr "지운 꾸러미 (설정 파일이 여전히 남아있음)"
 
-#: dselect/pkgdisplay.cc:114
+#: dselect/pkgdisplay.cc
 msgid "Purged packages and those never installed"
 msgstr "깨끗이 한 꾸러미 및 설치한 적이 없는 꾸러미"
 
-#: dselect/pkgdisplay.cc:116
-msgid "Installed"
-msgstr "설치됨"
-
-#: dselect/pkgdisplay.cc:118
+#: dselect/pkgdisplay.cc
 msgid "Purged"
 msgstr "깨끗이함"
 
-#: dselect/pkgdisplay.cc:138
+#: dselect/pkgdisplay.cc
 msgid "Error"
 msgstr "오류"
 
-#: dselect/pkgdisplay.cc:139
+#: dselect/pkgdisplay.cc
 msgid "Installed?"
 msgstr "설치 여부"
 
-#: dselect/pkgdisplay.cc:140
+#: dselect/pkgdisplay.cc
 msgid "Old mark"
 msgstr "이전 마크"
 
-#: dselect/pkgdisplay.cc:141
+#: dselect/pkgdisplay.cc
 msgid "Marked for"
 msgstr "현재 마크"
 
-#: dselect/pkgdisplay.cc:143
+#: dselect/pkgdisplay.cc
 msgid "EIOM"
 msgstr "EIOM"
 
-#: dselect/pkgdisplay.cc:147 dselect/pkgdisplay.cc:150
+#: dselect/pkgdisplay.cc
 msgid "Section"
 msgstr "섹션"
 
-#: dselect/pkgdisplay.cc:148
+#: dselect/pkgdisplay.cc
 msgid "Priority"
 msgstr "우선순위"
 
-#: dselect/pkgdisplay.cc:152
+#: dselect/pkgdisplay.cc
 msgid "Package"
 msgstr "꾸러미"
 
-#: dselect/pkgdisplay.cc:161 dselect/pkgdisplay.cc:165
+#: dselect/pkgdisplay.cc
 #, fuzzy
 #| msgid "Avail.ver"
 msgid "Avail.arch"
 msgstr "이용가능"
 
-#: dselect/pkgdisplay.cc:164
+#: dselect/pkgdisplay.cc
 #, fuzzy
 #| msgid "Inst.ver"
 msgid "Inst.arch"
 msgstr "설치버전"
 
-#: dselect/pkgdisplay.cc:178 dselect/pkgdisplay.cc:182
+#: dselect/pkgdisplay.cc
 msgid "Avail.ver"
 msgstr "이용가능"
 
-#: dselect/pkgdisplay.cc:181
+#: dselect/pkgdisplay.cc
 msgid "Inst.ver"
 msgstr "설치버전"
 
-#: dselect/pkgdisplay.cc:197
+#: dselect/pkgdisplay.cc
 msgid "dselect - recursive package listing"
 msgstr "dselect - 재귀 꾸러미 목록"
 
-#: dselect/pkgdisplay.cc:199
+#: dselect/pkgdisplay.cc
 msgid "dselect - inspection of package states"
 msgstr "dselect - 꾸러미 상태 감시"
 
-#: dselect/pkgdisplay.cc:200
+#: dselect/pkgdisplay.cc
 msgid "dselect - main package listing"
 msgstr "dselect - 주요 꾸러미 목록"
 
-#: dselect/pkgdisplay.cc:208
+#: dselect/pkgdisplay.cc
 msgid " (by section)"
 msgstr " (섹션 순서)"
 
-#: dselect/pkgdisplay.cc:211
+#: dselect/pkgdisplay.cc
 msgid " (avail., section)"
 msgstr " (이용가능, 섹션)"
 
-#: dselect/pkgdisplay.cc:214
+#: dselect/pkgdisplay.cc
 msgid " (status, section)"
 msgstr " (상태, 섹션)"
 
-#: dselect/pkgdisplay.cc:223
+#: dselect/pkgdisplay.cc
 msgid " (by priority)"
 msgstr " (우선순위 순서)"
 
-#: dselect/pkgdisplay.cc:226
+#: dselect/pkgdisplay.cc
 msgid " (avail., priority)"
 msgstr " (이용가능, 우선순위)"
 
-#: dselect/pkgdisplay.cc:229
+#: dselect/pkgdisplay.cc
 msgid " (status, priority)"
 msgstr " (상태, 우선순위)"
 
-#: dselect/pkgdisplay.cc:238
+#: dselect/pkgdisplay.cc
 msgid " (alphabetically)"
 msgstr " (알파벳 순서)"
 
-#: dselect/pkgdisplay.cc:241
+#: dselect/pkgdisplay.cc
 msgid " (by availability)"
 msgstr " (이용가능 순서)"
 
-#: dselect/pkgdisplay.cc:244
+#: dselect/pkgdisplay.cc
 msgid " (by status)"
 msgstr " (상태 순서)"
 
-#: dselect/pkgdisplay.cc:259
+#: dselect/pkgdisplay.cc
 msgid " mark:+/=/- terse:v help:?"
 msgstr " 표시:+/=/- 간단히:v 도움말:?"
 
-#: dselect/pkgdisplay.cc:260
+#: dselect/pkgdisplay.cc
 msgid " mark:+/=/- verbose:v help:?"
 msgstr " 표시:+/=/- 자세히:v 도움말:?"
 
-#: dselect/pkgdisplay.cc:262
+#: dselect/pkgdisplay.cc
 msgid " terse:v help:?"
 msgstr " 간단히:v 도움말:?"
 
-#: dselect/pkgdisplay.cc:263
+#: dselect/pkgdisplay.cc
 msgid " verbose:v help:?"
 msgstr " 자세히:v 도움말:?"
 
-#: dselect/pkginfo.cc:85
+#: dselect/pkginfo.cc
 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 "
@@ -1622,84 +1636,116 @@ msgstr ""
 "수 있습니다."
 
 # FIXME: bad msgid
-#: dselect/pkginfo.cc:98
+#: dselect/pkginfo.cc
 msgid "Interrelationships"
 msgstr "꾸러미 관계"
 
 # FIXME: bad msgid
-#: dselect/pkginfo.cc:117
+#: dselect/pkginfo.cc
 msgid "No description available."
 msgstr "상세 설명 없음."
 
-#: dselect/pkginfo.cc:135
+#: dselect/pkginfo.cc
 msgid "Installed control file information"
 msgstr "설치된 제어 파일 정보 "
 
-#: dselect/pkginfo.cc:151
+#: dselect/pkginfo.cc
 msgid "Available control file information"
 msgstr "현재 있는 제어 파일 정보"
 
-#: dselect/pkglist.cc:425
+#: dselect/pkglist.cc
 #, fuzzy
 #| msgid "Installed packages"
 msgid "there are no packages"
 msgstr "설치한 꾸러미"
 
-#: dselect/pkglist.cc:521
+#: dselect/pkglist.cc
 msgid "invalid search option given"
 msgstr "주어진 찾기 옵션이 올바르지 않습니다"
 
-#: dselect/pkglist.cc:536
+#: dselect/pkglist.cc
 msgid "error in regular expression"
 msgstr "정규식에 오류"
 
 # FIXME: bad msgid
-#: dselect/pkgsublist.cc:111
+#: dselect/pkgsublist.cc
 msgid " does not appear to be available\n"
 msgstr " 꾸러미는 이용할 수 없는 것으로 보입니다\n"
 
-#: dselect/pkgsublist.cc:131
+#: dselect/pkgsublist.cc
 msgid " or "
 msgstr " 혹은 "
 
-#: dselect/pkgtop.cc:58
+#: dselect/pkgtop.cc
 msgid "All"
 msgstr "모두"
 
-#: dselect/pkgtop.cc:80
+#: dselect/pkgtop.cc
 msgid "All packages"
 msgstr "모든 꾸러미"
 
-#: dselect/pkgtop.cc:84
+#: dselect/pkgtop.cc
 #, c-format
 msgid "%s packages without a section"
 msgstr "섹션에 속하지 않은 %s 꾸러미"
 
-#: dselect/pkgtop.cc:86
+#: dselect/pkgtop.cc
 #, c-format
 msgid "%s packages in section %s"
 msgstr "%s 꾸러미 (섹션 %s에 속하는 꾸러미)"
 
-#: dselect/pkgtop.cc:92
+#: dselect/pkgtop.cc
 #, c-format
 msgid "%s %s packages"
 msgstr "%s %s 꾸러미"
 
-#: dselect/pkgtop.cc:96
+#: dselect/pkgtop.cc
 #, c-format
 msgid "%s %s packages without a section"
 msgstr "섹션에 속하지 않은 %s %s 꾸러미"
 
-#: dselect/pkgtop.cc:98
+#: dselect/pkgtop.cc
 #, c-format
 msgid "%s %s packages in section %s"
 msgstr "%s %s 꾸러미 (%s 섹션)"
 
-#: dselect/pkgtop.cc:119
+#: dselect/pkgtop.cc
 #, c-format
 msgid "%-*s %s%s%s;  %s (was: %s).  %s"
 msgstr "%-*s %s%s%s,  %s (이전상태: %s).  %s"
 
+#, fuzzy
+#~| msgid "Section"
+#~ msgid "Actions:\n"
+#~ msgstr "섹션"
+
+#~ msgid "Colours:\n"
+#~ msgstr "색:\n"
+
+#~ msgid "Attributes:\n"
+#~ msgstr "속성:\n"
+
+#~ msgid "EOF before option name start"
+#~ msgstr "옵션 이름이 시작하기 전에 파일이 끝났습니다"
+
+#~ msgid "EOF before summary"
+#~ msgstr "요약 전에 파일이 끝났습니다"
+
+#~ msgid "!Bug!"
+#~ msgstr "!버그!"
+
+#~ msgid "Updated"
+#~ msgstr "업데이트한"
+
+#~ msgid "Up-to-date"
+#~ msgstr "최신"
+
+#~ msgid "Updated packages (newer version is available)"
+#~ msgstr "업데이트한 꾸러미 (새로운 버전이 있음)"
+
+#~ msgid "Available packages (not currently installed)"
+#~ msgstr "이용 가능한 꾸러미 (아직 설치되지 않음)"
+
 #~ msgid ""
 #~ "Actions:\n"
 #~ "  access update select install config remove quit\n"
diff --git a/dselect/po/nb.po b/dselect/po/nb.po
index 08dc729d6..c861600b1 100644
--- a/dselect/po/nb.po
+++ b/dselect/po/nb.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dselect 1.17.0\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2014-12-23 18:12+0100\n"
+"POT-Creation-Date: 2015-04-06 09:37+0200\n"
 "PO-Revision-Date: 2014-12-05 13:25+0200\n"
 "Last-Translator: Hans Fredrik Nordhaug <hans@nordhaug.priv.no>\n"
 "Language-Team: Norwegian Bokmål <i18n-nb@lister.ping.uio.no>\n"
@@ -18,29 +18,29 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: Virtaal 0.7.1\n"
 
-#: dselect/basecmds.cc:125
+#: dselect/basecmds.cc
 msgid "Search for ? "
 msgstr "Søk etter ? "
 
-#: dselect/basecmds.cc:149
+#: dselect/basecmds.cc
 msgid "Error: "
 msgstr "Feil: "
 
-#: dselect/basecmds.cc:180
+#: dselect/basecmds.cc
 msgid "Help: "
 msgstr "Hjelp: "
 
-#: dselect/basecmds.cc:186
+#: dselect/basecmds.cc
 msgid "Press ? for help menu, . for next topic, <space> to exit help."
 msgstr ""
 "Trykk ? for å vise hjelpemenyen, . for neste emne, <mellomrom> for å "
 "avslutte hjelp."
 
-#: dselect/basecmds.cc:193
+#: dselect/basecmds.cc
 msgid "Help information is available under the following topics:"
 msgstr "Hjelp for følgende emner er tilgjengelig:"
 
-#: dselect/basecmds.cc:201
+#: dselect/basecmds.cc
 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. "
@@ -48,239 +48,239 @@ msgstr ""
 "Trykk en tast fra lista over, <mellomrom> eller «q» for å avslutte hjelp,\n"
 "  eller «.» (punktum) for å lese hver hjelpeside etter hverandre. "
 
-#: dselect/basecmds.cc:207
+#: dselect/basecmds.cc
 msgid "error reading keyboard in help"
 msgstr "feil ved lesing av tastatur i hjelp"
 
-#: dselect/baselist.cc:60
+#: dselect/baselist.cc
 msgid "ioctl(TIOCGWINSZ) failed"
 msgstr "ioctl(TIOCGWINSZ) mislyktes"
 
-#: dselect/baselist.cc:63
+#: dselect/baselist.cc
 msgid "doupdate in SIGWINCH handler failed"
 msgstr "doupdate i SIGWINCH-håndtereren mislyktes"
 
-#: dselect/baselist.cc:72
+#: dselect/baselist.cc
 msgid "failed to restore old SIGWINCH sigact"
 msgstr "klarte ikke å gjenopprette gammel SIGWINCH sigact"
 
-#: dselect/baselist.cc:75
+#: dselect/baselist.cc
 msgid "failed to restore old signal mask"
 msgstr "klarte ikke å gjenopprette gammel signalmaske"
 
-#: dselect/baselist.cc:86
+#: dselect/baselist.cc
 msgid "failed to get old signal mask"
 msgstr "klarte ikke å hente gammel signalmaske"
 
-#: dselect/baselist.cc:88
+#: dselect/baselist.cc
 msgid "failed to get old SIGWINCH sigact"
 msgstr "klarte ikke å hente gammel SIGWINCH sigact"
 
-#: dselect/baselist.cc:93
+#: dselect/baselist.cc
 msgid "failed to block SIGWINCH"
 msgstr "klarte ikke å blokkere SIGWINCH"
 
-#: dselect/baselist.cc:99
+#: dselect/baselist.cc
 msgid "failed to set new SIGWINCH sigact"
 msgstr "klarte ikke å sette ny SIGWINCH sigact"
 
-#: dselect/baselist.cc:174
+#: dselect/baselist.cc
 msgid "failed to allocate colour pair"
 msgstr "klarte ikke å tilordne fargepar"
 
-#: dselect/baselist.cc:203
+#: dselect/baselist.cc
 msgid "failed to create title window"
 msgstr "klarte ikke lage tittelvindu"
 
-#: dselect/baselist.cc:207
+#: dselect/baselist.cc
 msgid "failed to create whatinfo window"
 msgstr "klarte ikke lage whatinfo-vindu"
 
-#: dselect/baselist.cc:211
+#: dselect/baselist.cc
 msgid "failed to create baselist pad"
 msgstr "klarte ikke lage baselist-pad"
 
-#: dselect/baselist.cc:214
+#: dselect/baselist.cc
 msgid "failed to create heading pad"
 msgstr "klarte ikke lage heading-pad"
 
-#: dselect/baselist.cc:218
+#: dselect/baselist.cc
 msgid "failed to create thisstate pad"
 msgstr "klarte ikke lage thisstate-pad"
 
-#: dselect/baselist.cc:222
+#: dselect/baselist.cc
 msgid "failed to create info pad"
 msgstr "klarte ikke lage info-pad"
 
-#: dselect/baselist.cc:227
+#: dselect/baselist.cc
 msgid "failed to create query window"
 msgstr "klarte ikke lage spørringsvindu"
 
-#: dselect/baselist.cc:298
+#: dselect/baselist.cc
 msgid "Keybindings"
 msgstr "Tastetrykk"
 
-#: dselect/baselist.cc:347
+#: dselect/baselist.cc
 #, c-format
 msgid "  -- %d%%, press "
 msgstr "  -- %d%%, trykk "
 
-#: dselect/baselist.cc:350
+#: dselect/baselist.cc
 #, c-format
 msgid "%s for more"
 msgstr "%s for mer"
 
-#: dselect/baselist.cc:354
+#: dselect/baselist.cc
 #, c-format
 msgid "%s to go back"
 msgstr "%s for å gå tilbake"
 
-#: dselect/bindings.cc:78
+#: dselect/bindings.cc
 msgid "[not bound]"
 msgstr "[ikke avgrenset]"
 
-#: dselect/bindings.cc:82
+#: dselect/bindings.cc
 #, c-format
 msgid "[unk: %d]"
 msgstr "[ukjent: %d]"
 
-#: dselect/bindings.cc:141
+#: dselect/bindings.cc
 msgid "Scroll onwards through help/information"
 msgstr "Gå videre gjennom hjelp/informasjon"
 
-#: dselect/bindings.cc:142
+#: dselect/bindings.cc
 msgid "Scroll backwards through help/information"
 msgstr "Gå bakover gjennom hjelp/informasjon"
 
-#: dselect/bindings.cc:143
+#: dselect/bindings.cc
 msgid "Move up"
 msgstr "Flytt opp"
 
-#: dselect/bindings.cc:144
+#: dselect/bindings.cc
 msgid "Move down"
 msgstr "Flytt ned"
 
-#: dselect/bindings.cc:145
+#: dselect/bindings.cc
 msgid "Go to top of list"
 msgstr "Gå til toppen av lista"
 
-#: dselect/bindings.cc:146
+#: dselect/bindings.cc
 msgid "Go to end of list"
 msgstr "Gå til slutten av lista"
 
-#: dselect/bindings.cc:147
+#: dselect/bindings.cc
 msgid "Request help (cycle through help screens)"
 msgstr "Be om hjelp (gå gjennom hjelpesidene)"
 
-#: dselect/bindings.cc:148
+#: dselect/bindings.cc
 msgid "Cycle through information displays"
 msgstr "Gå gjennom informasjonssidene"
 
-#: dselect/bindings.cc:149
+#: dselect/bindings.cc
 msgid "Redraw display"
 msgstr "Tegn sida på nytt"
 
-#: dselect/bindings.cc:150
+#: dselect/bindings.cc
 msgid "Scroll onwards through list by 1 line"
 msgstr "Gå videre gjennom lista med en linje"
 
-#: dselect/bindings.cc:151
+#: dselect/bindings.cc
 msgid "Scroll backwards through list by 1 line"
 msgstr "Gå bakover gjennom lista med en linje"
 
-#: dselect/bindings.cc:152
+#: dselect/bindings.cc
 msgid "Scroll onwards through help/information by 1 line"
 msgstr "Gå videre gjennom hjelp/informasjon med en linje"
 
-#: dselect/bindings.cc:153
+#: dselect/bindings.cc
 msgid "Scroll backwards through help/information by 1 line"
 msgstr "Gå bakover gjennom hjelp/informasjon med en linje"
 
-#: dselect/bindings.cc:154
+#: dselect/bindings.cc
 msgid "Scroll onwards through list"
 msgstr "Gå videre gjennom lista"
 
-#: dselect/bindings.cc:155
+#: dselect/bindings.cc
 msgid "Scroll backwards through list"
 msgstr "Gå bakover gjennom lista"
 
-#: dselect/bindings.cc:158
+#: dselect/bindings.cc
 msgid "Mark package(s) for installation"
 msgstr "Merk pakker for installasjon"
 
-#: dselect/bindings.cc:159
+#: dselect/bindings.cc
 msgid "Mark package(s) for deinstallation"
 msgstr "Merk pakker for avinstallasjon"
 
-#: dselect/bindings.cc:160
+#: dselect/bindings.cc
 msgid "Mark package(s) for deinstall and purge"
 msgstr "Merk pakker for avinstallasjon og slett"
 
-#: dselect/bindings.cc:161
+#: dselect/bindings.cc
 msgid "Make highlight more specific"
 msgstr "Gjør utheving mer spesifikk"
 
-#: dselect/bindings.cc:162
+#: dselect/bindings.cc
 msgid "Make highlight less specific"
 msgstr "Gjør utheving mindre spesifikk"
 
-#: dselect/bindings.cc:163
+#: dselect/bindings.cc
 msgid "Search for a package whose name contains a string"
 msgstr "Søk etter en pakke som har et navn som inneholder en streng"
 
-#: dselect/bindings.cc:164
+#: dselect/bindings.cc
 msgid "Repeat last search"
 msgstr "Gjenta forrige søk"
 
-#: dselect/bindings.cc:165
+#: dselect/bindings.cc
 msgid "Swap sort order priority/section"
 msgstr "Bytt om sorteringsrekkefølge prioritet/seksjon"
 
-#: dselect/bindings.cc:166
+#: dselect/bindings.cc
 msgid "Quit, confirming, and checking dependencies"
 msgstr "Avslutt, bekrefter, og sjekk pakkekrav"
 
-#: dselect/bindings.cc:167
+#: dselect/bindings.cc
 msgid "Quit, confirming without check"
 msgstr "Avslutt, bekreftelse uten sjekk"
 
-#: dselect/bindings.cc:168
+#: dselect/bindings.cc
 msgid "Quit, rejecting conflict/dependency suggestions"
 msgstr "Avslutt, avvis forslag til løsning av konflikt/pakkekrav"
 
-#: dselect/bindings.cc:169
+#: dselect/bindings.cc
 msgid "Abort - quit without making changes"
 msgstr "Avbryt - avslutt uten å gjøre endringer"
 
-#: dselect/bindings.cc:170
+#: dselect/bindings.cc
 msgid "Revert to old state for all packages"
 msgstr "Gå tilbake til gammel tilstand for alle pakker"
 
-#: dselect/bindings.cc:171
+#: dselect/bindings.cc
 msgid "Revert to suggested state for all packages"
 msgstr "Gå tilbake til foreslått tilstand for alle pakker"
 
-#: dselect/bindings.cc:172
+#: dselect/bindings.cc
 msgid "Revert to directly requested state for all packages"
 msgstr "Gå tilbake til direkte etterspurt tilstand for alle pakker"
 
-#: dselect/bindings.cc:173
+#: dselect/bindings.cc
 msgid "Revert to currently installed state for all packages"
 msgstr "Gå tilbake til nåværende installert tilstand for alle pakker"
 
-#: dselect/bindings.cc:176
+#: dselect/bindings.cc
 msgid "Select currently-highlighted access method"
 msgstr "Velg den uthevede tilgangsmetoden"
 
-#: dselect/bindings.cc:177
+#: dselect/bindings.cc
 msgid "Quit without changing selected access method"
 msgstr "Avslutt uten å endre den valgte tilgangsmetoden"
 
-#: dselect/helpmsgs.cc:29
+#: dselect/helpmsgs.cc
 msgid "Keystrokes"
 msgstr "Taster"
 
-#: dselect/helpmsgs.cc:29
+#: dselect/helpmsgs.cc
 msgid ""
 "Motion keys: Next/Previous, Top/End, Up/Down, Backwards/Forwards:\n"
 "  j, Down-arrow         k, Up-arrow             move highlight\n"
@@ -340,11 +340,11 @@ msgstr ""
 "avbryt)\n"
 "   D     sett alle til direkte etterspurt status    n, \\ gjenta siste søk\n"
 
-#: dselect/helpmsgs.cc:55
+#: dselect/helpmsgs.cc
 msgid "Introduction to package selections"
 msgstr "Introduksjon til pakkevalg"
 
-#: dselect/helpmsgs.cc:55
+#: dselect/helpmsgs.cc
 msgid ""
 "Welcome to dselect's main package listing.\n"
 "\n"
@@ -403,11 +403,11 @@ msgstr ""
 "\n"
 "Trykk <mellomrom> for å avslutte hjelp og gå til lista nå.\n"
 
-#: dselect/helpmsgs.cc:80
+#: dselect/helpmsgs.cc
 msgid "Introduction to read-only package list browser"
 msgstr "Introduksjon til skrivebeskyttet pakkeliste"
 
-#: dselect/helpmsgs.cc:80
+#: dselect/helpmsgs.cc
 msgid ""
 "Welcome to dselect's main package listing.\n"
 "\n"
@@ -443,11 +443,11 @@ msgstr ""
 "\n"
 "Trykk <mellomrom> for å avslutte hjelp og gå til lista nå.\n"
 
-#: dselect/helpmsgs.cc:99
+#: dselect/helpmsgs.cc
 msgid "Introduction to conflict/dependency resolution sub-list"
 msgstr "Introduksjon til egen liste for løsning av konflikt eller pakkekrav"
 
-#: dselect/helpmsgs.cc:99
+#: dselect/helpmsgs.cc
 msgid ""
 "Dependency/conflict resolution - introduction.\n"
 "\n"
@@ -509,11 +509,11 @@ msgstr ""
 "hjelp \n"
 "med «?».\n"
 
-#: dselect/helpmsgs.cc:125
+#: dselect/helpmsgs.cc
 msgid "Display, part 1: package listing and status chars"
 msgstr "Skjermbilde, del 1: Pakkeliste og statustegn"
 
-#: dselect/helpmsgs.cc:125
+#: dselect/helpmsgs.cc
 msgid ""
 "The top half of the screen shows a list of packages.  For each package you "
 "see\n"
@@ -576,11 +576,11 @@ msgstr ""
 "installerte og tilgjengelige versjoner (vis/skjul med Shift + V) og \n"
 "en kort beskrivelse.\n"
 
-#: dselect/helpmsgs.cc:152
+#: dselect/helpmsgs.cc
 msgid "Display, part 2: list highlight; information display"
 msgstr "Skjermbilde, del 2: Listemarkering, informasjonsvisning"
 
-#: dselect/helpmsgs.cc:152
+#: dselect/helpmsgs.cc
 msgid ""
 "* Highlight: One line in the package list will be highlighted.  It "
 "indicates\n"
@@ -630,11 +630,11 @@ msgstr ""
 "informasjonsfeltet \n"
 "eller utvide det slik at det dekker nesten hele skjermen.\n"
 
-#: dselect/helpmsgs.cc:176
+#: dselect/helpmsgs.cc
 msgid "Introduction to method selection display"
 msgstr "Introduksjon til metodevalg"
 
-#: dselect/helpmsgs.cc:176
+#: dselect/helpmsgs.cc
 msgid ""
 "dselect and dpkg can do automatic installation, loading the package files to "
 "be\n"
@@ -677,11 +677,11 @@ msgstr ""
 "Du kan se hele lista over tastetrykk ved å trykke på «k» nå eller fra \n"
 "hjelpemenyen som du får når du trykker «?».\n"
 
-#: dselect/helpmsgs.cc:196
+#: dselect/helpmsgs.cc
 msgid "Keystrokes for method selection"
 msgstr "Tastetrykk for metodevalg"
 
-#: dselect/helpmsgs.cc:196
+#: dselect/helpmsgs.cc
 msgid ""
 "Motion keys: Next/Previous, Top/End, Up/Down, Backwards/Forwards:\n"
 "  j, Down-arrow         k, Up-arrow             move highlight\n"
@@ -727,104 +727,104 @@ msgstr ""
 "  /                søk (bruk Enter til å avbryte med en gang)\n"
 "  \\                siste søk om igjen\n"
 
-#: dselect/main.cc:63
+#: dselect/main.cc
 msgid "Type dselect --help for help."
 msgstr "Skriv «dselect --help» for hjelp."
 
-#: dselect/main.cc:145
+#: dselect/main.cc
 msgid "a"
 msgstr "t"
 
-#: dselect/main.cc:145
+#: dselect/main.cc
 msgid "[A]ccess"
 msgstr "[T]ilgang"
 
-#: dselect/main.cc:145
+#: dselect/main.cc
 msgid "Choose the access method to use."
 msgstr "Velg tilgangsmetoden som skal brukes."
 
-#: dselect/main.cc:146
+#: dselect/main.cc
 msgid "u"
 msgstr "o"
 
-#: dselect/main.cc:146
+#: dselect/main.cc
 msgid "[U]pdate"
 msgstr "[O]ppdater"
 
-#: dselect/main.cc:146
+#: dselect/main.cc
 msgid "Update list of available packages, if possible."
 msgstr "Oppdater liste over tilgjengelige pakker, hvis mulig."
 
-#: dselect/main.cc:147
+#: dselect/main.cc
 msgid "s"
 msgstr "v"
 
-#: dselect/main.cc:147
+#: dselect/main.cc
 msgid "[S]elect"
 msgstr "[V]elg"
 
-#: dselect/main.cc:147
+#: dselect/main.cc
 msgid "Request which packages you want on your system."
 msgstr "Be om de pakkene du vil ha på systemet."
 
-#: dselect/main.cc:148
+#: dselect/main.cc
 msgid "i"
 msgstr "i"
 
-#: dselect/main.cc:148
+#: dselect/main.cc
 msgid "[I]nstall"
 msgstr "[I]nstaller"
 
-#: dselect/main.cc:148
+#: dselect/main.cc
 msgid "Install and upgrade wanted packages."
 msgstr "Installer og oppgrader de valgte pakkene."
 
-#: dselect/main.cc:149
+#: dselect/main.cc
 msgid "c"
 msgstr "s"
 
-#: dselect/main.cc:149
+#: dselect/main.cc
 msgid "[C]onfig"
 msgstr "[S]ett opp"
 
-#: dselect/main.cc:149
+#: dselect/main.cc
 msgid "Configure any packages that are unconfigured."
 msgstr "Sett opp pakker som ikke er satt opp."
 
-#: dselect/main.cc:150
+#: dselect/main.cc
 msgid "r"
 msgstr "f"
 
-#: dselect/main.cc:150
+#: dselect/main.cc
 msgid "[R]emove"
 msgstr "[F]jern"
 
-#: dselect/main.cc:150
+#: dselect/main.cc
 msgid "Remove unwanted software."
 msgstr "Fjern uønskede programmer."
 
-#: dselect/main.cc:151
+#: dselect/main.cc
 msgid "q"
 msgstr "a"
 
-#: dselect/main.cc:151
+#: dselect/main.cc
 msgid "[Q]uit"
 msgstr "[A]vslutt"
 
-#: dselect/main.cc:151
+#: dselect/main.cc
 msgid "Quit dselect."
 msgstr "Avslutter dselect."
 
-#: dselect/main.cc:152
+#: dselect/main.cc
 msgid "menu"
 msgstr "meny"
 
-#: dselect/main.cc:157
+#: dselect/main.cc
 #, c-format
 msgid "Debian `%s' package handling frontend version %s.\n"
 msgstr "Debian «%s» brukergrensesnitt for pakkehåndtering versjon %s.\n"
 
-#: dselect/main.cc:160
+#: dselect/main.cc
 msgid ""
 "This is free software; see the GNU General Public License version 2 or\n"
 "later for copying conditions. There is NO warranty.\n"
@@ -832,29 +832,47 @@ msgstr ""
 "Dette er fri programvare. Du finner kopieringsvilkårene i\n"
 "GNU General Public License versjon 2 eller nyere. Det finnes INGEN garanti.\n"
 
-#: dselect/main.cc:169 dselect/main.cc:217
+#: dselect/main.cc
 msgid "<standard output>"
 msgstr "<standard utdata>"
 
-#: dselect/main.cc:180
-#, c-format
+#: dselect/main.cc
+#, fuzzy, c-format
+#| msgid ""
+#| "Usage: %s [<option> ...] [<action> ...]\n"
+#| "\n"
 msgid ""
-"Usage: %s [<option> ...] [<action> ...]\n"
+"Usage: %s [<option>...] [<command>...]\n"
 "\n"
 msgstr ""
 "Bruk: %s [<valg> ...] [<handling> ...]\n"
 "\n"
 
-#: dselect/main.cc:184
+#: dselect/main.cc
 #, c-format
+msgid "Commands:\n"
+msgstr ""
+
+#: dselect/main.cc
+#, fuzzy, c-format
+#| msgid ""
+#| "Options:\n"
+#| "  --admindir <directory>     Use <directory> instead of %s.\n"
+#| "  --expert                   Turn on expert mode.\n"
+#| "  --debug <file> | -D<file>  Turn on debugging, sending output to "
+#| "<file>.\n"
+#| "  --colour | --color screenpart:[foreground],[background][:attr[+attr"
+#| "+...]]\n"
+#| "                             Configure screen colours.\n"
+#| "\n"
 msgid ""
 "Options:\n"
-"  --admindir <directory>     Use <directory> instead of %s.\n"
-"  --expert                   Turn on expert mode.\n"
-"  --debug <file> | -D<file>  Turn on debugging, sending output to <file>.\n"
-"  --colour | --color screenpart:[foreground],[background][:attr[+attr+...]]\n"
-"                             Configure screen colours.\n"
-"\n"
+"      --admindir <directory>       Use <directory> instead of %s.\n"
+"      --expert                     Turn on expert mode.\n"
+"  -D, --debug <file>               Turn on debugging, send output to "
+"<file>.\n"
+"      --color <color-spec>         Configure screen colors.\n"
+"      --colour <color-spec>        Ditto.\n"
 msgstr ""
 "Valg:\n"
 "  --admindir <katalog>     Bruk <katalog> i steden for %s.\n"
@@ -864,72 +882,79 @@ msgstr ""
 "                             Sett opp skjermfarger.\n"
 "\n"
 
-#: dselect/main.cc:193
-#, c-format
+#: dselect/main.cc
+#, fuzzy, c-format
+#| msgid ""
+#| "  --help                     Show this help message.\n"
+#| "  --version                  Show the version.\n"
+#| "\n"
 msgid ""
-"  --help                     Show this help message.\n"
-"  --version                  Show the version.\n"
+"  -?, --help                       Show this help message.\n"
+"      --version                    Show the version.\n"
 "\n"
 msgstr ""
 "  --help                     viser denne hjelpmeldingen.\n"
 "  --version                  viser versjonsnummeret.\n"
 "\n"
 
-#: dselect/main.cc:197
+#: dselect/main.cc
 #, c-format
-msgid "Actions:\n"
-msgstr "Handlinger:\n"
+msgid ""
+"<color-spec> is <screen-part>:[<foreground>],[<background>][:"
+"<attr>[+<attr>]...]\n"
+msgstr ""
 
-#: dselect/main.cc:202
-#, c-format
-msgid "Screenparts:\n"
+#: dselect/main.cc
+#, fuzzy, c-format
+#| msgid "Screenparts:\n"
+msgid "<screen-part> is:"
 msgstr "Skjermdeler:\n"
 
-#: dselect/main.cc:207
+#: dselect/main.cc
 #, c-format
-msgid "Colours:\n"
-msgstr "Farger:\n"
+msgid "<color> is:"
+msgstr ""
 
-#: dselect/main.cc:212
+#: dselect/main.cc
 #, c-format
-msgid "Attributes:\n"
-msgstr "Attributter:\n"
+msgid "<attr> is:"
+msgstr ""
 
-#: dselect/main.cc:232
+#: dselect/main.cc
 #, c-format
 msgid "couldn't open debug file `%.255s'\n"
 msgstr "klarte ikke åpne avlusingsfil `%.255s'\n"
 
-#: dselect/main.cc:253
+#: dselect/main.cc
 #, c-format
 msgid "invalid %s '%s'"
 msgstr "ugyldig %s '%s'"
 
-#: dselect/main.cc:272
+#: dselect/main.cc
 msgid "screen part"
 msgstr "skjermdel"
 
-#: dselect/main.cc:278
+#: dselect/main.cc
 msgid "null colour specification"
 msgstr "ingen fargespesifikasjon"
 
-#: dselect/main.cc:286 dselect/main.cc:291
+#: dselect/main.cc
 msgid "colour"
 msgstr "farge"
 
-#: dselect/main.cc:299
+#: dselect/main.cc
 msgid "colour attribute"
 msgstr "fargeattributt"
 
-#: dselect/main.cc:333
+#: dselect/main.cc
 msgid "Terminal does not appear to support cursor addressing.\n"
 msgstr "Terminalen ser ikke ut til å støtte markøradressering.\n"
 
-#: dselect/main.cc:335
+#: dselect/main.cc
 msgid "Terminal does not appear to support highlighting.\n"
 msgstr "Terminalen ser ikke ut til å støtte utheving.\n"
 
-#: dselect/main.cc:337
+#: dselect/main.cc
 #, c-format
 msgid ""
 "Set your TERM variable correctly, use a better terminal,\n"
@@ -938,11 +963,11 @@ msgstr ""
 "Sett TERM-variabelen riktig, bruk en bedre terminal eller \n"
 "du får klare deg med håndteringsverktøyet %s for hver pakke.\n"
 
-#: dselect/main.cc:340
+#: dselect/main.cc
 msgid "terminal lacks necessary features, giving up"
 msgstr "terminalen mangler nødvendige funksjoner, gir opp"
 
-#: dselect/main.cc:425
+#: dselect/main.cc
 msgid ""
 "\n"
 "\n"
@@ -957,7 +982,7 @@ msgstr ""
 "Trykk <enter> for å bekrefte utvalget.   ^L tegner skjermen på nytt.\n"
 "\n"
 
-#: dselect/main.cc:430
+#: dselect/main.cc
 msgid ""
 "Copyright (C) 1994-1996 Ian Jackson.\n"
 "Copyright (C) 2000,2001 Wichert Akkerman.\n"
@@ -965,7 +990,7 @@ msgstr ""
 "Opphavsrett (C) 1994-1996 Ian Jackson.\n"
 "Opphavsrett (C) 2000,2001 Wichert Akkerman.\n"
 
-#: dselect/main.cc:436
+#: dselect/main.cc
 msgid ""
 "\n"
 "\n"
@@ -975,57 +1000,57 @@ msgstr ""
 "\n"
 "Skrivebeskyttet tilgang: bare forhåndsvisning av utvalg er tilgjengelig!"
 
-#: dselect/main.cc:455
+#: dselect/main.cc
 msgid "failed to getch in main menu"
 msgstr "klarte ikke bruke «getch» i hovedmenyen"
 
-#: dselect/main.cc:538
+#: dselect/main.cc
 #, c-format
 msgid "unknown action string `%.50s'"
 msgstr "ukjent handlingsstreng `%.50s'"
 
-#: dselect/methlist.cc:66
+#: dselect/methlist.cc
 msgid "Abbrev."
 msgstr "Forkort."
 
-#: dselect/methlist.cc:67 dselect/pkgdisplay.cc:188 dselect/pkginfo.cc:110
+#: dselect/methlist.cc dselect/pkgdisplay.cc dselect/pkginfo.cc
 msgid "Description"
 msgstr "Beskrivelse"
 
-#: dselect/methlist.cc:73
+#: dselect/methlist.cc
 msgid "dselect - list of access methods"
 msgstr "dselect - liste over tilgangsmetoder"
 
-#: dselect/methlist.cc:82
+#: dselect/methlist.cc
 #, c-format
 msgid "Access method `%s'."
 msgstr "Tilgangsmetode `%s'."
 
-#: dselect/methlist.cc:161 dselect/pkglist.cc:587
+#: dselect/methlist.cc dselect/pkglist.cc
 msgid "doupdate failed"
 msgstr "«doupdate» mislyktes"
 
-#: dselect/methlist.cc:164 dselect/pkglist.cc:590
+#: dselect/methlist.cc dselect/pkglist.cc
 msgid "failed to unblock SIGWINCH"
 msgstr "klarte ikke avblokkere SIGWINCH"
 
-#: dselect/methlist.cc:169 dselect/pkglist.cc:595
+#: dselect/methlist.cc dselect/pkglist.cc
 msgid "failed to re-block SIGWINCH"
 msgstr "klarte ikke reblokkere SIGWINCH"
 
-#: dselect/methlist.cc:170 dselect/pkglist.cc:597
+#: dselect/methlist.cc dselect/pkglist.cc
 msgid "getch failed"
 msgstr "«getch» mislyktes"
 
-#: dselect/methlist.cc:187
+#: dselect/methlist.cc
 msgid "Explanation"
 msgstr "Forklaring"
 
-#: dselect/methlist.cc:197
+#: dselect/methlist.cc
 msgid "No explanation available."
 msgstr "Ingen forklaring tilgjengelig."
 
-#: dselect/method.cc:67
+#: dselect/method.cc
 #, c-format
 msgid ""
 "\n"
@@ -1036,7 +1061,7 @@ msgstr ""
 "\n"
 "%s: %s\n"
 
-#: dselect/method.cc:70
+#: dselect/method.cc
 msgid ""
 "\n"
 "Press <enter> to continue."
@@ -1044,185 +1069,195 @@ msgstr ""
 "\n"
 "Trykk <enter> for å fortsette."
 
-#: dselect/method.cc:82
+#: dselect/method.cc
 msgid "cannot unlock access method area"
 msgstr "klarte ikke låse opp område for tilgangsmetode"
 
-#: dselect/method.cc:96
+#: dselect/method.cc
 msgid "no access methods are available"
 msgstr "ingen tilgangsmetode er tilgjengelig"
 
-#: dselect/method.cc:115
+#: dselect/method.cc
 msgid "requested operation requires superuser privilege"
 msgstr "forespurte operasjon krever superbruker-rettigheter"
 
-#: dselect/method.cc:118
+#: dselect/method.cc
 msgid "cannot open or create access method lockfile"
 msgstr "klarte ikke åpne eller opprette låsefil for tilgangsmetode"
 
-#: dselect/method.cc:125
+#: dselect/method.cc
 msgid "the access method area is already locked"
 msgstr "tilgangsmetoden er allerede låst"
 
-#: dselect/method.cc:128
+#: dselect/method.cc
 msgid "cannot lock access method area"
 msgstr "klarte ikke låse område for tilgangsmetode"
 
-#: dselect/method.cc:161
+#: dselect/method.cc
 #, c-format
 msgid "Press <enter> to continue.\n"
 msgstr "Trykk <enter> for å fortsette.\n"
 
-#: dselect/method.cc:162
+#: dselect/method.cc
 msgid "<standard error>"
 msgstr "<standard feil>"
 
-#: dselect/method.cc:165
+#: dselect/method.cc
 msgid "error reading acknowledgement of program failure message"
 msgstr "feil ved lesing av godkjenning av programfeilmelding"
 
-#: dselect/method.cc:187
+#: dselect/method.cc
 msgid "no access method is selected or configured"
 msgstr "ingen tilgangsmetode er valgt eller satt opp"
 
-#: dselect/method.cc:196
+#: dselect/method.cc
 msgid "update available list script"
 msgstr "skript til oppdatering av tilgjengelighetsliste"
 
-#: dselect/method.cc:200
+#: dselect/method.cc
 msgid "installation script"
 msgstr "installasjonsskript"
 
-#: dselect/method.cc:246
+#: dselect/method.cc
 msgid "query/setup script"
 msgstr "skript til spørring/oppsett"
 
-#: dselect/methparse.cc:53
+#: dselect/methparse.cc
 #, c-format
 msgid "syntax error in method options file `%.250s' -- %s"
 msgstr "syntaksfeil i metodeopsjonsfila «%.250s» -- %s"
 
-#: dselect/methparse.cc:59
+#: dselect/methparse.cc
 #, c-format
 msgid "error reading options file `%.250s'"
 msgstr "feil ved lesing av opsjonsfila «%.250s»"
 
-#: dselect/methparse.cc:93
+#: dselect/methparse.cc
 #, c-format
 msgid "unable to read `%.250s' directory for reading methods"
 msgstr "klarte ikke lese katalogen «%.250s» for lesing av metoder"
 
-#: dselect/methparse.cc:109
+#: dselect/methparse.cc
 #, c-format
 msgid "method `%.250s' has name that is too long (%d > %d characters)"
 msgstr "metoden «%.250s» har for langt navn (%d > %d tegn)"
 
-#: dselect/methparse.cc:120
+#: dselect/methparse.cc
 #, c-format
 msgid "unable to access method script `%.250s'"
 msgstr "fikk ikke tilgang til metodeskriptet «%.250s»"
 
-#: dselect/methparse.cc:126
+#: dselect/methparse.cc
 #, c-format
 msgid "unable to read method options file `%.250s'"
 msgstr "klarte ikke lese metodeopsjonsfila «%.250s»"
 
-#: dselect/methparse.cc:150
+#: dselect/methparse.cc
 msgid "non-digit where digit wanted"
 msgstr "ikke-siffer der det skulle være et siffer "
 
-#: dselect/methparse.cc:153
-msgid "EOF in index string"
+#: dselect/methparse.cc
+#, fuzzy
+#| msgid "EOF in index string"
+msgid "end of file in index string"
 msgstr "slutt-på-fil i indeksstreng"
 
-#: dselect/methparse.cc:156
+#: dselect/methparse.cc
 msgid "index string too long"
 msgstr "for lang indeksstreng"
 
-#: dselect/methparse.cc:159
+#: dselect/methparse.cc
 msgid "newline before option name start"
 msgstr "linjeskift før starten på opsjonsnavnet"
 
-#: dselect/methparse.cc:161
-msgid "EOF before option name start"
-msgstr "slutt-på-fil før starten på opsjonsnavnet"
+#: dselect/methparse.cc
+#, fuzzy
+#| msgid "newline before option name start"
+msgid "end of file before option name start"
+msgstr "linjeskift før starten på opsjonsnavnet"
 
-#: dselect/methparse.cc:165
+#: dselect/methparse.cc
 msgid "nonalpha where option name start wanted"
 msgstr "ikke-bokstav der et opsjonsnavn skulle starte"
 
-#: dselect/methparse.cc:167
+#: dselect/methparse.cc
 msgid "non-alphanum in option name"
 msgstr "opsjonsnavnet inneholder tegn som ikke er tall eller bokstaver"
 
-#: dselect/methparse.cc:170
-msgid "EOF in option name"
+#: dselect/methparse.cc
+#, fuzzy
+#| msgid "EOF in option name"
+msgid "end of file in option name"
 msgstr "slutt-på-fil i opsjonsnavn"
 
-#: dselect/methparse.cc:175
+#: dselect/methparse.cc
 msgid "newline before summary"
 msgstr "linjeskift før sammendraget"
 
-#: dselect/methparse.cc:177
-msgid "EOF before summary"
-msgstr "slutt-på-fil før sammendraget"
+#: dselect/methparse.cc
+#, fuzzy
+#| msgid "newline before summary"
+msgid "end of file before summary"
+msgstr "linjeskift før sammendraget"
 
-#: dselect/methparse.cc:183
-msgid "EOF in summary - missing newline"
+#: dselect/methparse.cc
+#, fuzzy
+#| msgid "EOF in summary - missing newline"
+msgid "end of file in summary - missing newline"
 msgstr "slutt-på-fil i sammendraget - mangler linjeskift"
 
-#: dselect/methparse.cc:193
+#: dselect/methparse.cc
 #, c-format
 msgid "unable to open option description file `%.250s'"
 msgstr "klarte ikke åpne «%.250s» med opsjonsbeskrivelser"
 
-#: dselect/methparse.cc:197
+#: dselect/methparse.cc
 #, c-format
 msgid "unable to stat option description file `%.250s'"
 msgstr "fant ikke fila «%.250s» med opsjonsbeskrivelser"
 
-#: dselect/methparse.cc:201
+#: dselect/methparse.cc
 #, c-format
 msgid "failed to read option description file `%.250s'"
 msgstr "klarte ikke lese fila «%.250s» med opsjonsbeskrivelser"
 
-#: dselect/methparse.cc:204
+#: dselect/methparse.cc
 #, c-format
 msgid "error during read of option description file `%.250s'"
 msgstr "feil ved lesing av fila «%.250s» med opsjonsbeskrivelser"
 
-#: dselect/methparse.cc:227
+#: dselect/methparse.cc
 #, c-format
 msgid "error during read of method options file `%.250s'"
 msgstr "feil ved lesing av metodeopsjonsfila «%.250s»"
 
-#: dselect/methparse.cc:250
+#: dselect/methparse.cc
 #, c-format
 msgid "unable to open current option file `%.250s'"
 msgstr "klarte ikke åpne opsjonsfila «%.250s»"
 
-#: dselect/methparse.cc:286
+#: dselect/methparse.cc
 #, c-format
 msgid "unable to write new option to `%.250s'"
 msgstr "klarte ikke skrive den nye opsjonsfila «%.250s»"
 
-#: dselect/pkgdisplay.cc:36
+#: dselect/pkgdisplay.cc
 msgid "new package"
 msgstr "ny pakke"
 
-#: dselect/pkgdisplay.cc:37
+#: dselect/pkgdisplay.cc
 msgid "install"
 msgstr "installer"
 
-#: dselect/pkgdisplay.cc:38
+#: dselect/pkgdisplay.cc
 msgid "hold"
 msgstr "hold tilbake"
 
-#: dselect/pkgdisplay.cc:39
+#: dselect/pkgdisplay.cc
 msgid "remove"
 msgstr "fjern"
 
-#: dselect/pkgdisplay.cc:40
+#: dselect/pkgdisplay.cc
 msgid "purge"
 msgstr "rens"
 
@@ -1230,327 +1265,321 @@ msgstr "rens"
 #. * the empty string to store information about the translation. DO NOT
 #. * CHANGE THAT IN A TRANSLATION! The code really relies on that being
 #. * a single space.
-#: dselect/pkgdisplay.cc:47
+#: dselect/pkgdisplay.cc
 msgid " "
 msgstr " "
 
-#: dselect/pkgdisplay.cc:48
+#: dselect/pkgdisplay.cc
 msgid "REINSTALL"
 msgstr "INSTALLER OM IGJEN"
 
-#: dselect/pkgdisplay.cc:51
+#: dselect/pkgdisplay.cc
 msgid "not installed"
 msgstr "ikke installert"
 
-#: dselect/pkgdisplay.cc:52
+#: dselect/pkgdisplay.cc
 msgid "removed (configs remain)"
 msgstr "fjernet (tatt vare på oppsett)"
 
-#: dselect/pkgdisplay.cc:53
+#: dselect/pkgdisplay.cc
 msgid "half installed"
 msgstr "halvinstallert"
 
-#: dselect/pkgdisplay.cc:54
+#: dselect/pkgdisplay.cc
 msgid "unpacked (not set up)"
 msgstr "utpakket (ikke satt opp)"
 
-#: dselect/pkgdisplay.cc:55
+#: dselect/pkgdisplay.cc
 msgid "half configured (config failed)"
 msgstr "halvveis satt opp (oppsett mislyktes)"
 
-#: dselect/pkgdisplay.cc:56
+#: dselect/pkgdisplay.cc
 msgid "awaiting trigger processing"
 msgstr "venter på utløserprosessering"
 
-#: dselect/pkgdisplay.cc:57
+#: dselect/pkgdisplay.cc
 msgid "triggered"
 msgstr "utløst"
 
-#: dselect/pkgdisplay.cc:58
+#: dselect/pkgdisplay.cc
 msgid "installed"
 msgstr "installert"
 
-#: dselect/pkgdisplay.cc:61
+#: dselect/pkgdisplay.cc
 msgid "Required"
 msgstr "Påkrevet"
 
-#: dselect/pkgdisplay.cc:62
+#: dselect/pkgdisplay.cc
 msgid "Important"
 msgstr "Viktig"
 
-#: dselect/pkgdisplay.cc:63
+#: dselect/pkgdisplay.cc
 msgid "Standard"
 msgstr "Standard"
 
-#: dselect/pkgdisplay.cc:64
+#: dselect/pkgdisplay.cc
 msgid "Optional"
 msgstr "Valgfri"
 
-#: dselect/pkgdisplay.cc:65
+#: dselect/pkgdisplay.cc
 msgid "Extra"
 msgstr "Ekstra"
 
-#: dselect/pkgdisplay.cc:66
-msgid "!Bug!"
-msgstr "!Lus!"
-
-#: dselect/pkgdisplay.cc:67
+#: dselect/pkgdisplay.cc
 msgid "Unclassified"
 msgstr "Uklassifisert"
 
-#: dselect/pkgdisplay.cc:70
+#: dselect/pkgdisplay.cc
 msgid "suggests"
 msgstr "foreslår"
 
-#: dselect/pkgdisplay.cc:71
+#: dselect/pkgdisplay.cc
 msgid "recommends"
 msgstr "anbefaler"
 
-#: dselect/pkgdisplay.cc:72
+#: dselect/pkgdisplay.cc
 msgid "depends on"
 msgstr "krever"
 
-#: dselect/pkgdisplay.cc:73
+#: dselect/pkgdisplay.cc
 msgid "pre-depends on"
 msgstr "forkrav"
 
-#: dselect/pkgdisplay.cc:74
+#: dselect/pkgdisplay.cc
 msgid "breaks"
 msgstr "ødelegger"
 
-#: dselect/pkgdisplay.cc:75
+#: dselect/pkgdisplay.cc
 msgid "conflicts with"
 msgstr "konflikt med"
 
-#: dselect/pkgdisplay.cc:76
+#: dselect/pkgdisplay.cc
 msgid "provides"
 msgstr "gir"
 
-#: dselect/pkgdisplay.cc:77
+#: dselect/pkgdisplay.cc
 msgid "replaces"
 msgstr "erstatter"
 
-#: dselect/pkgdisplay.cc:78
+#: dselect/pkgdisplay.cc
 msgid "enhances"
 msgstr "forbedrer"
 
-#: dselect/pkgdisplay.cc:81
+#: dselect/pkgdisplay.cc
 msgid "Req"
 msgstr "Krv"
 
-#: dselect/pkgdisplay.cc:82
+#: dselect/pkgdisplay.cc
 msgid "Imp"
 msgstr "Vkt"
 
-#: dselect/pkgdisplay.cc:83
+#: dselect/pkgdisplay.cc
 msgid "Std"
 msgstr "Std"
 
-#: dselect/pkgdisplay.cc:84
+#: dselect/pkgdisplay.cc
 msgid "Opt"
 msgstr "Val"
 
-#: dselect/pkgdisplay.cc:85
+#: dselect/pkgdisplay.cc
 msgid "Xtr"
 msgstr "Eks"
 
-#: dselect/pkgdisplay.cc:86
+#: dselect/pkgdisplay.cc
 msgid "bUG"
 msgstr "LUS"
 
-#: dselect/pkgdisplay.cc:87
+#: dselect/pkgdisplay.cc
 msgid "?"
 msgstr "?"
 
-#: dselect/pkgdisplay.cc:95 dselect/pkgdisplay.cc:115
+#: dselect/pkgdisplay.cc
 msgid "Broken"
 msgstr "Ødelagt"
 
-#: dselect/pkgdisplay.cc:96
+#: dselect/pkgdisplay.cc
 msgid "New"
 msgstr "Nye"
 
-#: dselect/pkgdisplay.cc:97
-msgid "Updated"
-msgstr "Oppdaterte"
+#: dselect/pkgdisplay.cc
+msgid "Upgradable"
+msgstr ""
 
-#: dselect/pkgdisplay.cc:98
+#: dselect/pkgdisplay.cc
 msgid "Obsolete/local"
 msgstr "Foreldet/lokale"
 
-#: dselect/pkgdisplay.cc:99
-msgid "Up-to-date"
-msgstr "Ferdig oppdaterte"
+#: dselect/pkgdisplay.cc
+msgid "Installed"
+msgstr "Installerte"
 
-#: dselect/pkgdisplay.cc:100
+#: dselect/pkgdisplay.cc
 msgid "Available"
 msgstr "Tilgjengelige"
 
-#: dselect/pkgdisplay.cc:101 dselect/pkgdisplay.cc:117
+#: dselect/pkgdisplay.cc
 msgid "Removed"
 msgstr "Fjernet"
 
-#: dselect/pkgdisplay.cc:102 dselect/pkgdisplay.cc:111
+#: dselect/pkgdisplay.cc
 msgid "Brokenly installed packages"
 msgstr "Ødelagte installerte pakker"
 
-#: dselect/pkgdisplay.cc:103
+#: dselect/pkgdisplay.cc
 msgid "Newly available packages"
 msgstr "Nye tilgjengelige pakker"
 
-#: dselect/pkgdisplay.cc:104
-msgid "Updated packages (newer version is available)"
-msgstr "Oppdaterte pakker (nyere versjon tilgjengelig)"
+#: dselect/pkgdisplay.cc
+#, fuzzy
+#| msgid "Newly available packages"
+msgid "Upgradable packages"
+msgstr "Nye tilgjengelige pakker"
 
-#: dselect/pkgdisplay.cc:105
-msgid "Obsolete and local packages present on system"
+#: dselect/pkgdisplay.cc
+#, fuzzy
+#| msgid "Obsolete and local packages present on system"
+msgid "Obsolete and locally created packages"
 msgstr "Foreldete og lokale pakker på systemet"
 
-#: dselect/pkgdisplay.cc:106
-msgid "Up to date installed packages"
-msgstr "Pakker som er installerte i nyeste versjon"
+#: dselect/pkgdisplay.cc
+msgid "Installed packages"
+msgstr "Installerte pakker"
 
-#: dselect/pkgdisplay.cc:107
-msgid "Available packages (not currently installed)"
-msgstr "Tilgjengelige pakker (ikke installerte)"
+#: dselect/pkgdisplay.cc
+#, fuzzy
+#| msgid "Up to date installed packages"
+msgid "Available not installed packages"
+msgstr "Pakker som er installerte i nyeste versjon"
 
-#: dselect/pkgdisplay.cc:108
+#: dselect/pkgdisplay.cc
 msgid "Removed and no longer available packages"
 msgstr "Fjernede pakker som ikke lenger er tilgjengelige"
 
-#: dselect/pkgdisplay.cc:112
-msgid "Installed packages"
-msgstr "Installerte pakker"
-
-#: dselect/pkgdisplay.cc:113
+#: dselect/pkgdisplay.cc
 msgid "Removed packages (configuration still present)"
 msgstr "Fjernede pakker (tatt vare på oppsettet)"
 
-#: dselect/pkgdisplay.cc:114
+#: dselect/pkgdisplay.cc
 msgid "Purged packages and those never installed"
 msgstr "Pakker som er renset bort eller aldri installerte"
 
-#: dselect/pkgdisplay.cc:116
-msgid "Installed"
-msgstr "Installerte"
-
-#: dselect/pkgdisplay.cc:118
+#: dselect/pkgdisplay.cc
 msgid "Purged"
 msgstr "Renset"
 
-#: dselect/pkgdisplay.cc:138
+#: dselect/pkgdisplay.cc
 msgid "Error"
 msgstr "Feil"
 
-#: dselect/pkgdisplay.cc:139
+#: dselect/pkgdisplay.cc
 msgid "Installed?"
 msgstr "Installert?"
 
-#: dselect/pkgdisplay.cc:140
+#: dselect/pkgdisplay.cc
 msgid "Old mark"
 msgstr "Gammelt merke"
 
-#: dselect/pkgdisplay.cc:141
+#: dselect/pkgdisplay.cc
 msgid "Marked for"
 msgstr "Markert for"
 
-#: dselect/pkgdisplay.cc:143
+#: dselect/pkgdisplay.cc
 msgid "EIOM"
 msgstr "FIGM"
 
-#: dselect/pkgdisplay.cc:147 dselect/pkgdisplay.cc:150
+#: dselect/pkgdisplay.cc
 msgid "Section"
 msgstr "Del"
 
-#: dselect/pkgdisplay.cc:148
+#: dselect/pkgdisplay.cc
 msgid "Priority"
 msgstr "Prioritet"
 
-#: dselect/pkgdisplay.cc:152
+#: dselect/pkgdisplay.cc
 msgid "Package"
 msgstr "Pakke"
 
-#: dselect/pkgdisplay.cc:161 dselect/pkgdisplay.cc:165
+#: dselect/pkgdisplay.cc
 msgid "Avail.arch"
 msgstr "Tilgj.ark"
 
-#: dselect/pkgdisplay.cc:164
+#: dselect/pkgdisplay.cc
 msgid "Inst.arch"
 msgstr "Inst.ark"
 
-#: dselect/pkgdisplay.cc:178 dselect/pkgdisplay.cc:182
+#: dselect/pkgdisplay.cc
 msgid "Avail.ver"
 msgstr "Tilgj.ver"
 
-#: dselect/pkgdisplay.cc:181
+#: dselect/pkgdisplay.cc
 msgid "Inst.ver"
 msgstr "Inst.ver"
 
-#: dselect/pkgdisplay.cc:197
+#: dselect/pkgdisplay.cc
 msgid "dselect - recursive package listing"
 msgstr "dselect - rekursiv pakkeliste"
 
-#: dselect/pkgdisplay.cc:199
+#: dselect/pkgdisplay.cc
 msgid "dselect - inspection of package states"
 msgstr "dselect - inspeksjon av pakkestatus"
 
-#: dselect/pkgdisplay.cc:200
+#: dselect/pkgdisplay.cc
 msgid "dselect - main package listing"
 msgstr "dselect - hovedpakkeliste"
 
-#: dselect/pkgdisplay.cc:208
+#: dselect/pkgdisplay.cc
 msgid " (by section)"
 msgstr " (etter del)"
 
-#: dselect/pkgdisplay.cc:211
+#: dselect/pkgdisplay.cc
 msgid " (avail., section)"
 msgstr " (tilgj., del)"
 
-#: dselect/pkgdisplay.cc:214
+#: dselect/pkgdisplay.cc
 msgid " (status, section)"
 msgstr " (status, del)"
 
-#: dselect/pkgdisplay.cc:223
+#: dselect/pkgdisplay.cc
 msgid " (by priority)"
 msgstr " (etter prioritet)"
 
-#: dselect/pkgdisplay.cc:226
+#: dselect/pkgdisplay.cc
 msgid " (avail., priority)"
 msgstr " (tilgj., prioritet)"
 
-#: dselect/pkgdisplay.cc:229
+#: dselect/pkgdisplay.cc
 msgid " (status, priority)"
 msgstr " (status, prioritet)"
 
-#: dselect/pkgdisplay.cc:238
+#: dselect/pkgdisplay.cc
 msgid " (alphabetically)"
 msgstr " (alfabetisk)"
 
-#: dselect/pkgdisplay.cc:241
+#: dselect/pkgdisplay.cc
 msgid " (by availability)"
 msgstr " (etter tilgjengelighet)"
 
-#: dselect/pkgdisplay.cc:244
+#: dselect/pkgdisplay.cc
 msgid " (by status)"
 msgstr " (etter status)"
 
-#: dselect/pkgdisplay.cc:259
+#: dselect/pkgdisplay.cc
 msgid " mark:+/=/- terse:v help:?"
 msgstr " marker:+/=/- kort:v hjelp:?"
 
-#: dselect/pkgdisplay.cc:260
+#: dselect/pkgdisplay.cc
 msgid " mark:+/=/- verbose:v help:?"
 msgstr " marker:+/=/- fyldig:v hjelp:?"
 
-#: dselect/pkgdisplay.cc:262
+#: dselect/pkgdisplay.cc
 msgid " terse:v help:?"
 msgstr " kort:v hjelp:?"
 
-#: dselect/pkgdisplay.cc:263
+#: dselect/pkgdisplay.cc
 msgid " verbose:v help:?"
 msgstr " fyldig:v hjelp:?"
 
-#: dselect/pkginfo.cc:85
+#: dselect/pkginfo.cc
 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 "
@@ -1570,80 +1599,110 @@ msgstr ""
 "Du kan endre sorteringsrekkefølge med «o» og «O» for selv å kunne markere "
 "pakker i andre grupper."
 
-#: dselect/pkginfo.cc:98
+#: dselect/pkginfo.cc
 msgid "Interrelationships"
 msgstr "Sammenhenger"
 
-#: dselect/pkginfo.cc:117
+#: dselect/pkginfo.cc
 msgid "No description available."
 msgstr "Ingen beskrivelse tilgjengelig."
 
-#: dselect/pkginfo.cc:135
+#: dselect/pkginfo.cc
 msgid "Installed control file information"
 msgstr "Installert kontrollfilinformasjon"
 
-#: dselect/pkginfo.cc:151
+#: dselect/pkginfo.cc
 msgid "Available control file information"
 msgstr "Tilgjengelig kontrollfilinformasjon"
 
-#: dselect/pkglist.cc:425
+#: dselect/pkglist.cc
 msgid "there are no packages"
 msgstr "det er ingen pakker"
 
-#: dselect/pkglist.cc:521
+#: dselect/pkglist.cc
 msgid "invalid search option given"
 msgstr "ugyldig søkevalg oppgitt"
 
-#: dselect/pkglist.cc:536
+#: dselect/pkglist.cc
 msgid "error in regular expression"
 msgstr "feil i regulært uttrykk"
 
-#: dselect/pkgsublist.cc:111
+#: dselect/pkgsublist.cc
 msgid " does not appear to be available\n"
 msgstr " ser ikke ut til å være tilgjengelig\n"
 
-#: dselect/pkgsublist.cc:131
+#: dselect/pkgsublist.cc
 msgid " or "
 msgstr " eller "
 
-#: dselect/pkgtop.cc:58
+#: dselect/pkgtop.cc
 msgid "All"
 msgstr "Alle"
 
-#: dselect/pkgtop.cc:80
+#: dselect/pkgtop.cc
 msgid "All packages"
 msgstr "Alle pakker"
 
-#: dselect/pkgtop.cc:84
+#: dselect/pkgtop.cc
 #, c-format
 msgid "%s packages without a section"
 msgstr "%s pakker uten noen del"
 
-#: dselect/pkgtop.cc:86
+#: dselect/pkgtop.cc
 #, c-format
 msgid "%s packages in section %s"
 msgstr "%s pakker i delen %s"
 
-#: dselect/pkgtop.cc:92
+#: dselect/pkgtop.cc
 #, c-format
 msgid "%s %s packages"
 msgstr "%s %s pakker"
 
-#: dselect/pkgtop.cc:96
+#: dselect/pkgtop.cc
 #, c-format
 msgid "%s %s packages without a section"
 msgstr "%s %s pakker uten noen del"
 
-#: dselect/pkgtop.cc:98
+#: dselect/pkgtop.cc
 #, c-format
 msgid "%s %s packages in section %s"
 msgstr "%s %s pakker i delen %s"
 
-#: dselect/pkgtop.cc:119
+#: dselect/pkgtop.cc
 #, c-format
 msgid "%-*s %s%s%s;  %s (was: %s).  %s"
 msgstr "%-*s %s%s%s;  %s (var: %s).  %s"
 
+#~ msgid "Actions:\n"
+#~ msgstr "Handlinger:\n"
+
+#~ msgid "Colours:\n"
+#~ msgstr "Farger:\n"
+
+#~ msgid "Attributes:\n"
+#~ msgstr "Attributter:\n"
+
+#~ msgid "EOF before option name start"
+#~ msgstr "slutt-på-fil før starten på opsjonsnavnet"
+
+#~ msgid "EOF before summary"
+#~ msgstr "slutt-på-fil før sammendraget"
+
+#~ msgid "!Bug!"
+#~ msgstr "!Lus!"
+
+#~ msgid "Updated"
+#~ msgstr "Oppdaterte"
+
+#~ msgid "Up-to-date"
+#~ msgstr "Ferdig oppdaterte"
+
+#~ msgid "Updated packages (newer version is available)"
+#~ msgstr "Oppdaterte pakker (nyere versjon tilgjengelig)"
+
+#~ msgid "Available packages (not currently installed)"
+#~ msgstr "Tilgjengelige pakker (ikke installerte)"
+
 #~ msgid ""
 #~ "Actions:\n"
 #~ "  access update select install config remove quit\n"
diff --git a/dselect/po/nl.po b/dselect/po/nl.po
index 32386667c..ef0d15434 100644
--- a/dselect/po/nl.po
+++ b/dselect/po/nl.po
@@ -9,7 +9,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-12-23 18:12+0100\n"
+"POT-Creation-Date: 2015-04-06 09:37+0200\n"
 "PO-Revision-Date: 2014-11-28 01:08+0100\n"
 "Last-Translator: Frans Spiesschaert <Frans.Spiesschaert@yucom.be>\n"
 "Language-Team: Dutch <debian-l10n-dutch@lists.debian.org>\n"
@@ -19,28 +19,28 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: dselect/basecmds.cc:125
+#: dselect/basecmds.cc
 msgid "Search for ? "
 msgstr "Zoeken naar ? "
 
-#: dselect/basecmds.cc:149
+#: dselect/basecmds.cc
 msgid "Error: "
 msgstr "Fout: "
 
-#: dselect/basecmds.cc:180
+#: dselect/basecmds.cc
 msgid "Help: "
 msgstr "Hulp: "
 
-#: dselect/basecmds.cc:186
+#: dselect/basecmds.cc
 msgid "Press ? for help menu, . for next topic, <space> to exit help."
 msgstr ""
 "Druk ? voor hulpmenu, . voor volgend onderwerp, <spatie> = hulp verlaten."
 
-#: dselect/basecmds.cc:193
+#: dselect/basecmds.cc
 msgid "Help information is available under the following topics:"
 msgstr "Hulp is beschikbaar voor de volgende onderwerpen:"
 
-#: dselect/basecmds.cc:201
+#: dselect/basecmds.cc
 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. "
@@ -49,239 +49,239 @@ msgstr ""
 "  <spatie> of `q' om de hulppagina's af te sluiten,\n"
 "  of `.' (punt) om alle pagina's een voor een te lezen. "
 
-#: dselect/basecmds.cc:207
+#: dselect/basecmds.cc
 msgid "error reading keyboard in help"
 msgstr "fout bij het lezen van het toetsenbord in de hulpdialoog"
 
-#: dselect/baselist.cc:60
+#: dselect/baselist.cc
 msgid "ioctl(TIOCGWINSZ) failed"
 msgstr "ioctl(TIOCGWINSZ) mislukt"
 
-#: dselect/baselist.cc:63
+#: dselect/baselist.cc
 msgid "doupdate in SIGWINCH handler failed"
 msgstr "doupdate in SIGWINCH-verwerker is mislukt"
 
-#: dselect/baselist.cc:72
+#: dselect/baselist.cc
 msgid "failed to restore old SIGWINCH sigact"
 msgstr "kon oude SIGWINCH sigact (terminalwaarden) niet terugzetten"
 
-#: dselect/baselist.cc:75
+#: dselect/baselist.cc
 msgid "failed to restore old signal mask"
 msgstr "kon oud signaalmasker niet terugzetten"
 
-#: dselect/baselist.cc:86
+#: dselect/baselist.cc
 msgid "failed to get old signal mask"
 msgstr "kon oud signaalmasker niet opvragen"
 
-#: dselect/baselist.cc:88
+#: dselect/baselist.cc
 msgid "failed to get old SIGWINCH sigact"
 msgstr "kon oude SIGWINCH sigact (terminalwaarden) niet opvragen"
 
-#: dselect/baselist.cc:93
+#: dselect/baselist.cc
 msgid "failed to block SIGWINCH"
 msgstr "kon SIGWINCH niet blokkeren"
 
-#: dselect/baselist.cc:99
+#: dselect/baselist.cc
 msgid "failed to set new SIGWINCH sigact"
 msgstr "kon nieuwe SIGWINCH sigact (terminalwaarden) niet instellen"
 
-#: dselect/baselist.cc:174
+#: dselect/baselist.cc
 msgid "failed to allocate colour pair"
 msgstr "kon kleurenpaar niet toewijzen"
 
-#: dselect/baselist.cc:203
+#: dselect/baselist.cc
 msgid "failed to create title window"
 msgstr "kon titelvenster niet aanmaken"
 
-#: dselect/baselist.cc:207
+#: dselect/baselist.cc
 msgid "failed to create whatinfo window"
 msgstr "kon whatinfo-venster niet aanmaken"
 
-#: dselect/baselist.cc:211
+#: dselect/baselist.cc
 msgid "failed to create baselist pad"
 msgstr "kon lijstgebied niet aanmaken"
 
-#: dselect/baselist.cc:214
+#: dselect/baselist.cc
 msgid "failed to create heading pad"
 msgstr "kon kopgebied niet aanmaken"
 
-#: dselect/baselist.cc:218
+#: dselect/baselist.cc
 msgid "failed to create thisstate pad"
 msgstr "kon statusgebied niet aanmaken"
 
-#: dselect/baselist.cc:222
+#: dselect/baselist.cc
 msgid "failed to create info pad"
 msgstr "kon infogebied niet aanmaken"
 
-#: dselect/baselist.cc:227
+#: dselect/baselist.cc
 msgid "failed to create query window"
 msgstr "kon vragenvenster niet aanmaken"
 
-#: dselect/baselist.cc:298
+#: dselect/baselist.cc
 msgid "Keybindings"
 msgstr "Toetsenbindingen"
 
-#: dselect/baselist.cc:347
+#: dselect/baselist.cc
 #, c-format
 msgid "  -- %d%%, press "
 msgstr "  -- %d%%, druk op "
 
-#: dselect/baselist.cc:350
+#: dselect/baselist.cc
 #, c-format
 msgid "%s for more"
 msgstr "%s voor meer"
 
-#: dselect/baselist.cc:354
+#: dselect/baselist.cc
 #, c-format
 msgid "%s to go back"
 msgstr "%s om terug te gaan"
 
-#: dselect/bindings.cc:78
+#: dselect/bindings.cc
 msgid "[not bound]"
 msgstr "[niet gebonden]"
 
-#: dselect/bindings.cc:82
+#: dselect/bindings.cc
 #, c-format
 msgid "[unk: %d]"
 msgstr "[onbek: %d]"
 
-#: dselect/bindings.cc:141
+#: dselect/bindings.cc
 msgid "Scroll onwards through help/information"
 msgstr "Schuif door hulp/informatie"
 
-#: dselect/bindings.cc:142
+#: dselect/bindings.cc
 msgid "Scroll backwards through help/information"
 msgstr "Schuif terug door hulp/informatie"
 
-#: dselect/bindings.cc:143
+#: dselect/bindings.cc
 msgid "Move up"
 msgstr "Ga omhoog"
 
-#: dselect/bindings.cc:144
+#: dselect/bindings.cc
 msgid "Move down"
 msgstr "Ga omlaag"
 
-#: dselect/bindings.cc:145
+#: dselect/bindings.cc
 msgid "Go to top of list"
 msgstr "Ga naar de top van de lijst"
 
-#: dselect/bindings.cc:146
+#: dselect/bindings.cc
 msgid "Go to end of list"
 msgstr "Ga naar het eind van de lijst"
 
-#: dselect/bindings.cc:147
+#: dselect/bindings.cc
 msgid "Request help (cycle through help screens)"
 msgstr "Vraag hulp op (wisselen van hulpschermen)"
 
-#: dselect/bindings.cc:148
+#: dselect/bindings.cc
 msgid "Cycle through information displays"
 msgstr "Wissel tussen informatieschermen"
 
-#: dselect/bindings.cc:149
+#: dselect/bindings.cc
 msgid "Redraw display"
 msgstr "Beeld verversen"
 
-#: dselect/bindings.cc:150
+#: dselect/bindings.cc
 msgid "Scroll onwards through list by 1 line"
 msgstr "Schuif door de lijst met 1 regel"
 
-#: dselect/bindings.cc:151
+#: dselect/bindings.cc
 msgid "Scroll backwards through list by 1 line"
 msgstr "Schuif terug door de lijst met 1 regel"
 
-#: dselect/bindings.cc:152
+#: dselect/bindings.cc
 msgid "Scroll onwards through help/information by 1 line"
 msgstr "Schuif door de hulp/informatie met 1 regel"
 
-#: dselect/bindings.cc:153
+#: dselect/bindings.cc
 msgid "Scroll backwards through help/information by 1 line"
 msgstr "Schuif terug door de hulp/informatie met 1 regel"
 
-#: dselect/bindings.cc:154
+#: dselect/bindings.cc
 msgid "Scroll onwards through list"
 msgstr "Schuif door de lijst"
 
-#: dselect/bindings.cc:155
+#: dselect/bindings.cc
 msgid "Scroll backwards through list"
 msgstr "Schuif terug door de lijst"
 
-#: dselect/bindings.cc:158
+#: dselect/bindings.cc
 msgid "Mark package(s) for installation"
 msgstr "Markeer pakket(ten) als te installeren"
 
-#: dselect/bindings.cc:159
+#: dselect/bindings.cc
 msgid "Mark package(s) for deinstallation"
 msgstr "Markeer pakket(ten) als te de-installeren"
 
-#: dselect/bindings.cc:160
+#: dselect/bindings.cc
 msgid "Mark package(s) for deinstall and purge"
 msgstr "Markeer pakket(ten) als te verwijderen en te wissen"
 
-#: dselect/bindings.cc:161
+#: dselect/bindings.cc
 msgid "Make highlight more specific"
 msgstr "Maak markering specifieker"
 
-#: dselect/bindings.cc:162
+#: dselect/bindings.cc
 msgid "Make highlight less specific"
 msgstr "Maak markering minder specifiek"
 
-#: dselect/bindings.cc:163
+#: dselect/bindings.cc
 msgid "Search for a package whose name contains a string"
 msgstr "Zoek een pakket waarvan de naam een tekenreeks bevat"
 
-#: dselect/bindings.cc:164
+#: dselect/bindings.cc
 msgid "Repeat last search"
 msgstr "Herhaal laatste zoekopdracht"
 
-#: dselect/bindings.cc:165
+#: dselect/bindings.cc
 msgid "Swap sort order priority/section"
 msgstr "Wissel sorteervolgorde prioriteit/sectie"
 
-#: dselect/bindings.cc:166
+#: dselect/bindings.cc
 msgid "Quit, confirming, and checking dependencies"
 msgstr "Beëindigen, met bevestiging en vereistencontrole"
 
-#: dselect/bindings.cc:167
+#: dselect/bindings.cc
 msgid "Quit, confirming without check"
 msgstr "Beëindigen, met bevestiging zonder controle"
 
-#: dselect/bindings.cc:168
+#: dselect/bindings.cc
 msgid "Quit, rejecting conflict/dependency suggestions"
 msgstr "Beëindigen, zonder conflict/vereisten suggesties te accepteren"
 
-#: dselect/bindings.cc:169
+#: dselect/bindings.cc
 msgid "Abort - quit without making changes"
 msgstr "Afbreken - beëindigen zonder veranderingen te maken"
 
-#: dselect/bindings.cc:170
+#: dselect/bindings.cc
 msgid "Revert to old state for all packages"
 msgstr "Teruggaan naar de oude staat voor alle pakketten"
 
-#: dselect/bindings.cc:171
+#: dselect/bindings.cc
 msgid "Revert to suggested state for all packages"
 msgstr "Teruggaan naar voorgestelde staat voor alle pakketten"
 
-#: dselect/bindings.cc:172
+#: dselect/bindings.cc
 msgid "Revert to directly requested state for all packages"
 msgstr "Teruggaan naar direct gevraagde staat voor alle pakketten"
 
-#: dselect/bindings.cc:173
+#: dselect/bindings.cc
 msgid "Revert to currently installed state for all packages"
 msgstr "Teruggaan naar de momenteel geïnstalleerde staat voor alle pakketten"
 
-#: dselect/bindings.cc:176
+#: dselect/bindings.cc
 msgid "Select currently-highlighted access method"
 msgstr "Kies de momenteel gemarkeerde toegangsmethode"
 
-#: dselect/bindings.cc:177
+#: dselect/bindings.cc
 msgid "Quit without changing selected access method"
 msgstr "Beëindigen zonder de toegangsmethode te veranderen"
 
-#: dselect/helpmsgs.cc:29
+#: dselect/helpmsgs.cc
 msgid "Keystrokes"
 msgstr "Toetsen"
 
-#: dselect/helpmsgs.cc:29
+#: dselect/helpmsgs.cc
 msgid ""
 "Motion keys: Next/Previous, Top/End, Up/Down, Backwards/Forwards:\n"
 "  j, Down-arrow         k, Up-arrow             move highlight\n"
@@ -345,11 +345,11 @@ msgstr ""
 "(Enter=einde)\n"
 "   D    Zet alles op direct gevraagde staat         n, \\  herhaal zoeken\n"
 
-#: dselect/helpmsgs.cc:55
+#: dselect/helpmsgs.cc
 msgid "Introduction to package selections"
 msgstr "Inleiding in het selecteren van pakketten"
 
-#: dselect/helpmsgs.cc:55
+#: dselect/helpmsgs.cc
 msgid ""
 "Welcome to dselect's main package listing.\n"
 "\n"
@@ -408,11 +408,11 @@ msgstr ""
 " u nog een lijst krijgen.\n"
 "Druk nu op <spatie> om dit hulpscherm te verlaten en naar de lijst te gaan.\n"
 
-#: dselect/helpmsgs.cc:80
+#: dselect/helpmsgs.cc
 msgid "Introduction to read-only package list browser"
 msgstr "Inleiding tot het doorlopen van de lijst met pakketten (alleen-lezen)"
 
-#: dselect/helpmsgs.cc:80
+#: dselect/helpmsgs.cc
 msgid ""
 "Welcome to dselect's main package listing.\n"
 "\n"
@@ -454,11 +454,11 @@ msgstr ""
 "\n"
 "Druk nu op <spatie> om dit hulpscherm te verlaten en naar de lijst te gaan.\n"
 
-#: dselect/helpmsgs.cc:99
+#: dselect/helpmsgs.cc
 msgid "Introduction to conflict/dependency resolution sub-list"
 msgstr "Inleiding in de sub-lijst voor het oplossen van conflicten/vereisten"
 
-#: dselect/helpmsgs.cc:99
+#: dselect/helpmsgs.cc
 msgid ""
 "Dependency/conflict resolution - introduction.\n"
 "\n"
@@ -525,11 +525,11 @@ msgstr ""
 "Druk <spatie> om uit hulp en naar de sub-lijst te gaan; onthoud: `?' is "
 "hulp.\n"
 
-#: dselect/helpmsgs.cc:125
+#: dselect/helpmsgs.cc
 msgid "Display, part 1: package listing and status chars"
 msgstr "Scherm, deel 1: pakkettenlijst en statustekens"
 
-#: dselect/helpmsgs.cc:125
+#: dselect/helpmsgs.cc
 msgid ""
 "The top half of the screen shows a list of packages.  For each package you "
 "see\n"
@@ -591,11 +591,11 @@ msgstr ""
 "Ook te zien zijn de Prioriteit, Sectie, naam, geïnstalleerde en beschikbare\n"
 "versienummers (shift-V om te tonen/verbergen) en een korte omschrijving.\n"
 
-#: dselect/helpmsgs.cc:152
+#: dselect/helpmsgs.cc
 msgid "Display, part 2: list highlight; information display"
 msgstr "Scherm, deel 2: markering in de lijst; informatiescherm"
 
-#: dselect/helpmsgs.cc:152
+#: dselect/helpmsgs.cc
 msgid ""
 "* Highlight: One line in the package list will be highlighted.  It "
 "indicates\n"
@@ -644,11 +644,11 @@ msgstr ""
 "het\n"
 "  informatiescherm te vergroten of te verbergen.\n"
 
-#: dselect/helpmsgs.cc:176
+#: dselect/helpmsgs.cc
 msgid "Introduction to method selection display"
 msgstr "Inleiding in het scherm voor de keuze van een toegangsmethode"
 
-#: dselect/helpmsgs.cc:176
+#: dselect/helpmsgs.cc
 msgid ""
 "dselect and dpkg can do automatic installation, loading the package files to "
 "be\n"
@@ -689,11 +689,11 @@ msgstr ""
 "op\n"
 "`k' te drukken, of later vanuit het hulpmenu dat u kunt bereiken met `?'.\n"
 
-#: dselect/helpmsgs.cc:196
+#: dselect/helpmsgs.cc
 msgid "Keystrokes for method selection"
 msgstr "Nuttige toetsen bij de keuze van een methode"
 
-#: dselect/helpmsgs.cc:196
+#: dselect/helpmsgs.cc
 msgid ""
 "Motion keys: Next/Previous, Top/End, Up/Down, Backwards/Forwards:\n"
 "  j, Down-arrow         k, Up-arrow             move highlight\n"
@@ -742,104 +742,104 @@ msgstr ""
 "  /                zoeken (gewoon Enter om te annuleren)\n"
 "  \\                laatste zoekopdracht herhalen\n"
 
-#: dselect/main.cc:63
+#: dselect/main.cc
 msgid "Type dselect --help for help."
 msgstr "Type dselect --help voor hulp."
 
-#: dselect/main.cc:145
+#: dselect/main.cc
 msgid "a"
 msgstr "t"
 
-#: dselect/main.cc:145
+#: dselect/main.cc
 msgid "[A]ccess"
 msgstr "[T]oegang"
 
-#: dselect/main.cc:145
+#: dselect/main.cc
 msgid "Choose the access method to use."
 msgstr "Kies de te gebruiken toegangsmethode."
 
-#: dselect/main.cc:146
+#: dselect/main.cc
 msgid "u"
 msgstr "b"
 
-#: dselect/main.cc:146
+#: dselect/main.cc
 msgid "[U]pdate"
 msgstr "[B]ijwerken"
 
-#: dselect/main.cc:146
+#: dselect/main.cc
 msgid "Update list of available packages, if possible."
 msgstr "Werk de lijst met pakketten bij, indien mogelijk."
 
-#: dselect/main.cc:147
+#: dselect/main.cc
 msgid "s"
 msgstr "s"
 
-#: dselect/main.cc:147
+#: dselect/main.cc
 msgid "[S]elect"
 msgstr "[S]electeer"
 
-#: dselect/main.cc:147
+#: dselect/main.cc
 msgid "Request which packages you want on your system."
 msgstr "Geef aan welke pakketten u op uw systeem wilt."
 
-#: dselect/main.cc:148
+#: dselect/main.cc
 msgid "i"
 msgstr "i"
 
-#: dselect/main.cc:148
+#: dselect/main.cc
 msgid "[I]nstall"
 msgstr "[I]nstalleren"
 
-#: dselect/main.cc:148
+#: dselect/main.cc
 msgid "Install and upgrade wanted packages."
 msgstr "Installeer pakketten of werk gewenste pakketten bij."
 
-#: dselect/main.cc:149
+#: dselect/main.cc
 msgid "c"
 msgstr "c"
 
-#: dselect/main.cc:149
+#: dselect/main.cc
 msgid "[C]onfig"
 msgstr "[C]onfigureren"
 
-#: dselect/main.cc:149
+#: dselect/main.cc
 msgid "Configure any packages that are unconfigured."
 msgstr "Configureer pakketten die nog niet geconfigureerd zijn."
 
-#: dselect/main.cc:150
+#: dselect/main.cc
 msgid "r"
 msgstr "v"
 
-#: dselect/main.cc:150
+#: dselect/main.cc
 msgid "[R]emove"
 msgstr "[V]erwijderen"
 
-#: dselect/main.cc:150
+#: dselect/main.cc
 msgid "Remove unwanted software."
 msgstr "Verwijder ongewenste programmatuur."
 
-#: dselect/main.cc:151
+#: dselect/main.cc
 msgid "q"
 msgstr "e"
 
-#: dselect/main.cc:151
+#: dselect/main.cc
 msgid "[Q]uit"
 msgstr "[E]inde"
 
-#: dselect/main.cc:151
+#: dselect/main.cc
 msgid "Quit dselect."
 msgstr "dselect afsluiten."
 
-#: dselect/main.cc:152
+#: dselect/main.cc
 msgid "menu"
 msgstr "menu"
 
-#: dselect/main.cc:157
+#: dselect/main.cc
 #, c-format
 msgid "Debian `%s' package handling frontend version %s.\n"
 msgstr "Debian `%s' pakketbeheer-frontend versie %s.\n"
 
-#: dselect/main.cc:160
+#: dselect/main.cc
 msgid ""
 "This is free software; see the GNU General Public License version 2 or\n"
 "later for copying conditions. There is NO warranty.\n"
@@ -847,29 +847,47 @@ 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:169 dselect/main.cc:217
+#: dselect/main.cc
 msgid "<standard output>"
 msgstr "<standaard uitvoer>"
 
-#: dselect/main.cc:180
-#, c-format
+#: dselect/main.cc
+#, fuzzy, c-format
+#| msgid ""
+#| "Usage: %s [<option> ...] [<action> ...]\n"
+#| "\n"
 msgid ""
-"Usage: %s [<option> ...] [<action> ...]\n"
+"Usage: %s [<option>...] [<command>...]\n"
 "\n"
 msgstr ""
 "Gebruik: %s [<optie> ...] [<actie> ...]\n"
 "\n"
 
-#: dselect/main.cc:184
+#: dselect/main.cc
 #, c-format
+msgid "Commands:\n"
+msgstr ""
+
+#: dselect/main.cc
+#, fuzzy, c-format
+#| msgid ""
+#| "Options:\n"
+#| "  --admindir <directory>     Use <directory> instead of %s.\n"
+#| "  --expert                   Turn on expert mode.\n"
+#| "  --debug <file> | -D<file>  Turn on debugging, sending output to "
+#| "<file>.\n"
+#| "  --colour | --color screenpart:[foreground],[background][:attr[+attr"
+#| "+...]]\n"
+#| "                             Configure screen colours.\n"
+#| "\n"
 msgid ""
 "Options:\n"
-"  --admindir <directory>     Use <directory> instead of %s.\n"
-"  --expert                   Turn on expert mode.\n"
-"  --debug <file> | -D<file>  Turn on debugging, sending output to <file>.\n"
-"  --colour | --color screenpart:[foreground],[background][:attr[+attr+...]]\n"
-"                             Configure screen colours.\n"
-"\n"
+"      --admindir <directory>       Use <directory> instead of %s.\n"
+"      --expert                     Turn on expert mode.\n"
+"  -D, --debug <file>               Turn on debugging, send output to "
+"<file>.\n"
+"      --color <color-spec>         Configure screen colors.\n"
+"      --colour <color-spec>        Ditto.\n"
 msgstr ""
 "Opties:\n"
 "  --admindir <map>              Gebruik <map> i.p.v. %s.\n"
@@ -880,72 +898,79 @@ msgstr ""
 "                                Stel schermkleuren in.\n"
 "\n"
 
-#: dselect/main.cc:193
-#, c-format
+#: dselect/main.cc
+#, fuzzy, c-format
+#| msgid ""
+#| "  --help                     Show this help message.\n"
+#| "  --version                  Show the version.\n"
+#| "\n"
 msgid ""
-"  --help                     Show this help message.\n"
-"  --version                  Show the version.\n"
+"  -?, --help                       Show this help message.\n"
+"      --version                    Show the version.\n"
 "\n"
 msgstr ""
 "  --help                     Toon deze hulpboodschap.\n"
 "  --version                  Toon de versie.\n"
 "\n"
 
-#: dselect/main.cc:197
+#: dselect/main.cc
 #, c-format
-msgid "Actions:\n"
-msgstr "Acties:\n"
+msgid ""
+"<color-spec> is <screen-part>:[<foreground>],[<background>][:"
+"<attr>[+<attr>]...]\n"
+msgstr ""
 
-#: dselect/main.cc:202
-#, c-format
-msgid "Screenparts:\n"
+#: dselect/main.cc
+#, fuzzy, c-format
+#| msgid "Screenparts:\n"
+msgid "<screen-part> is:"
 msgstr "Schermdelen:\n"
 
-#: dselect/main.cc:207
+#: dselect/main.cc
 #, c-format
-msgid "Colours:\n"
-msgstr "Kleuren:\n"
+msgid "<color> is:"
+msgstr ""
 
-#: dselect/main.cc:212
+#: dselect/main.cc
 #, c-format
-msgid "Attributes:\n"
-msgstr "Attributen:\n"
+msgid "<attr> is:"
+msgstr ""
 
-#: dselect/main.cc:232
+#: dselect/main.cc
 #, c-format
 msgid "couldn't open debug file `%.255s'\n"
 msgstr "kon debugbestand `%.255s' niet openen\n"
 
-#: dselect/main.cc:253
+#: dselect/main.cc
 #, c-format
 msgid "invalid %s '%s'"
 msgstr "Ongeldige %s '%s'"
 
-#: dselect/main.cc:272
+#: dselect/main.cc
 msgid "screen part"
 msgstr "schermdeel"
 
-#: dselect/main.cc:278
+#: dselect/main.cc
 msgid "null colour specification"
 msgstr "Blanco-kleur specificatie"
 
-#: dselect/main.cc:286 dselect/main.cc:291
+#: dselect/main.cc
 msgid "colour"
 msgstr "kleur"
 
-#: dselect/main.cc:299
+#: dselect/main.cc
 msgid "colour attribute"
 msgstr "kleurattribuut"
 
-#: dselect/main.cc:333
+#: dselect/main.cc
 msgid "Terminal does not appear to support cursor addressing.\n"
 msgstr "Terminal lijkt de cursor niet te kunnen besturen.\n"
 
-#: dselect/main.cc:335
+#: dselect/main.cc
 msgid "Terminal does not appear to support highlighting.\n"
 msgstr "Terminal lijkt markeren niet te ondersteunen.\n"
 
-#: dselect/main.cc:337
+#: dselect/main.cc
 #, c-format
 msgid ""
 "Set your TERM variable correctly, use a better terminal,\n"
@@ -954,11 +979,11 @@ msgstr ""
 "Zet uw variabele TERM goed, gebruik een betere terminal,\n"
 "of doe het met het per-pakket beheerhulpmiddel %s.\n"
 
-#: dselect/main.cc:340
+#: dselect/main.cc
 msgid "terminal lacks necessary features, giving up"
 msgstr "terminal mist essentiële functionaliteit, er wordt opgegeven"
 
-#: dselect/main.cc:425
+#: dselect/main.cc
 msgid ""
 "\n"
 "\n"
@@ -972,7 +997,7 @@ msgstr ""
 "Druk op <enter> om selectie te activeren.  ^L ververst het beeld.\n"
 "\n"
 
-#: dselect/main.cc:430
+#: dselect/main.cc
 msgid ""
 "Copyright (C) 1994-1996 Ian Jackson.\n"
 "Copyright (C) 2000,2001 Wichert Akkerman.\n"
@@ -980,7 +1005,7 @@ msgstr ""
 "Copyright (C) 1994-1996 Ian Jackson.\n"
 "Copyright (C) 2000,2001 Wichert Akkerman.\n"
 
-#: dselect/main.cc:436
+#: dselect/main.cc
 msgid ""
 "\n"
 "\n"
@@ -990,57 +1015,57 @@ msgstr ""
 "\n"
 "Toegang is alleen lezen: de selecties worden niet bewaard!"
 
-#: dselect/main.cc:455
+#: dselect/main.cc
 msgid "failed to getch in main menu"
 msgstr "toets lezen in hoofdmenu is mislukt"
 
-#: dselect/main.cc:538
+#: dselect/main.cc
 #, c-format
 msgid "unknown action string `%.50s'"
 msgstr "onbekend actiewoord `%.50s'"
 
-#: dselect/methlist.cc:66
+#: dselect/methlist.cc
 msgid "Abbrev."
 msgstr "Afkorting"
 
-#: dselect/methlist.cc:67 dselect/pkgdisplay.cc:188 dselect/pkginfo.cc:110
+#: dselect/methlist.cc dselect/pkgdisplay.cc dselect/pkginfo.cc
 msgid "Description"
 msgstr "Omschrijving"
 
-#: dselect/methlist.cc:73
+#: dselect/methlist.cc
 msgid "dselect - list of access methods"
 msgstr "dselect - lijst van toegangsmethodes"
 
-#: dselect/methlist.cc:82
+#: dselect/methlist.cc
 #, c-format
 msgid "Access method `%s'."
 msgstr "Toegangsmethode `%s'."
 
-#: dselect/methlist.cc:161 dselect/pkglist.cc:587
+#: dselect/methlist.cc dselect/pkglist.cc
 msgid "doupdate failed"
 msgstr "doupdate is mislukt"
 
-#: dselect/methlist.cc:164 dselect/pkglist.cc:590
+#: dselect/methlist.cc dselect/pkglist.cc
 msgid "failed to unblock SIGWINCH"
 msgstr "kon SIGWINCH niet deblokkeren"
 
-#: dselect/methlist.cc:169 dselect/pkglist.cc:595
+#: dselect/methlist.cc dselect/pkglist.cc
 msgid "failed to re-block SIGWINCH"
 msgstr "kon SIGWINCH niet opnieuw blokkeren"
 
-#: dselect/methlist.cc:170 dselect/pkglist.cc:597
+#: dselect/methlist.cc dselect/pkglist.cc
 msgid "getch failed"
 msgstr "getch is mislukt"
 
-#: dselect/methlist.cc:187
+#: dselect/methlist.cc
 msgid "Explanation"
 msgstr "Verklaring"
 
-#: dselect/methlist.cc:197
+#: dselect/methlist.cc
 msgid "No explanation available."
 msgstr "Geen uitleg beschikbaar."
 
-#: dselect/method.cc:67
+#: dselect/method.cc
 #, c-format
 msgid ""
 "\n"
@@ -1051,7 +1076,7 @@ msgstr ""
 "\n"
 "%s: %s\n"
 
-#: dselect/method.cc:70
+#: dselect/method.cc
 msgid ""
 "\n"
 "Press <enter> to continue."
@@ -1059,186 +1084,196 @@ msgstr ""
 "\n"
 "Druk op <enter> om door te gaan."
 
-#: dselect/method.cc:82
+#: dselect/method.cc
 msgid "cannot unlock access method area"
 msgstr "kan toegangsmethodegebied niet ontgrendelen"
 
-#: dselect/method.cc:96
+#: dselect/method.cc
 msgid "no access methods are available"
 msgstr "er zijn geen toegangsmethodes beschikbaar"
 
-#: dselect/method.cc:115
+#: dselect/method.cc
 msgid "requested operation requires superuser privilege"
 msgstr "de gevraagde bewerking vereist beheerdersrechten"
 
-#: dselect/method.cc:118
+#: dselect/method.cc
 msgid "cannot open or create access method lockfile"
 msgstr ""
 "kan het bestand dat de toegangsmethode vergrendelt niet openen of aanmaken"
 
-#: dselect/method.cc:125
+#: dselect/method.cc
 msgid "the access method area is already locked"
 msgstr "het toegangsmethodegebied is al vergrendeld"
 
-#: dselect/method.cc:128
+#: dselect/method.cc
 msgid "cannot lock access method area"
 msgstr "kan het toegangsmethodegebied niet vergrendelen"
 
-#: dselect/method.cc:161
+#: dselect/method.cc
 #, c-format
 msgid "Press <enter> to continue.\n"
 msgstr "Druk op <enter> om door te gaan.\n"
 
-#: dselect/method.cc:162
+#: dselect/method.cc
 msgid "<standard error>"
 msgstr "<standaard fout>"
 
-#: dselect/method.cc:165
+#: dselect/method.cc
 msgid "error reading acknowledgement of program failure message"
 msgstr "kon bevestigingsbericht van programmafout niet lezen"
 
-#: dselect/method.cc:187
+#: dselect/method.cc
 msgid "no access method is selected or configured"
 msgstr "er is geen toegangsmethode geselecteerd of geconfigureerd"
 
-#: dselect/method.cc:196
+#: dselect/method.cc
 msgid "update available list script"
 msgstr "script voor bijwerken van beschikbaarheidslijst"
 
-#: dselect/method.cc:200
+#: dselect/method.cc
 msgid "installation script"
 msgstr "installatiescript"
 
-#: dselect/method.cc:246
+#: dselect/method.cc
 msgid "query/setup script"
 msgstr "vragen/instellen script"
 
-#: dselect/methparse.cc:53
+#: dselect/methparse.cc
 #, c-format
 msgid "syntax error in method options file `%.250s' -- %s"
 msgstr "syntaxisfout in bestand met methodeopties`%.250s' -- %s"
 
-#: dselect/methparse.cc:59
+#: dselect/methparse.cc
 #, c-format
 msgid "error reading options file `%.250s'"
 msgstr "fout bij lezen optiebestand `%.250s'"
 
-#: dselect/methparse.cc:93
+#: dselect/methparse.cc
 #, c-format
 msgid "unable to read `%.250s' directory for reading methods"
 msgstr "kon niet in map `%.250s' lezen om de methodes in te lezen"
 
-#: dselect/methparse.cc:109
+#: dselect/methparse.cc
 #, c-format
 msgid "method `%.250s' has name that is too long (%d > %d characters)"
 msgstr "methode `%.250s' heeft een te lange naam (%d > %d tekens)"
 
-#: dselect/methparse.cc:120
+#: dselect/methparse.cc
 #, c-format
 msgid "unable to access method script `%.250s'"
 msgstr "kon methodescript `%.250s' niet benaderen"
 
-#: dselect/methparse.cc:126
+#: dselect/methparse.cc
 #, c-format
 msgid "unable to read method options file `%.250s'"
 msgstr "kon bestand met methodeopties `%.250s' niet lezen"
 
-#: dselect/methparse.cc:150
+#: dselect/methparse.cc
 msgid "non-digit where digit wanted"
 msgstr "niet-cijfers waar een cijfer gewenst is"
 
-#: dselect/methparse.cc:153
-msgid "EOF in index string"
+#: dselect/methparse.cc
+#, fuzzy
+#| msgid "EOF in index string"
+msgid "end of file in index string"
 msgstr "EOF in indextekst"
 
-#: dselect/methparse.cc:156
+#: dselect/methparse.cc
 msgid "index string too long"
 msgstr "indextekst te lang"
 
-#: dselect/methparse.cc:159
+#: dselect/methparse.cc
 msgid "newline before option name start"
 msgstr "nieuwe regel voor begin optienaam"
 
-#: dselect/methparse.cc:161
-msgid "EOF before option name start"
-msgstr "EOF voor begin optienaam"
+#: dselect/methparse.cc
+#, fuzzy
+#| msgid "newline before option name start"
+msgid "end of file before option name start"
+msgstr "nieuwe regel voor begin optienaam"
 
-#: dselect/methparse.cc:165
+#: dselect/methparse.cc
 msgid "nonalpha where option name start wanted"
 msgstr "niet-letter waar een optienaam gewenst is"
 
-#: dselect/methparse.cc:167
+#: dselect/methparse.cc
 msgid "non-alphanum in option name"
 msgstr "niet-alfanumeriek teken in optienaam"
 
-#: dselect/methparse.cc:170
-msgid "EOF in option name"
+#: dselect/methparse.cc
+#, fuzzy
+#| msgid "EOF in option name"
+msgid "end of file in option name"
 msgstr "EOF in optienaam"
 
-#: dselect/methparse.cc:175
+#: dselect/methparse.cc
 msgid "newline before summary"
 msgstr "nieuwe regel voor samenvatting"
 
-#: dselect/methparse.cc:177
-msgid "EOF before summary"
-msgstr "EOF voor samenvatting"
+#: dselect/methparse.cc
+#, fuzzy
+#| msgid "newline before summary"
+msgid "end of file before summary"
+msgstr "nieuwe regel voor samenvatting"
 
-#: dselect/methparse.cc:183
-msgid "EOF in summary - missing newline"
+#: dselect/methparse.cc
+#, fuzzy
+#| msgid "EOF in summary - missing newline"
+msgid "end of file in summary - missing newline"
 msgstr "EOF in samenvatting - ontbrekende nieuwe regel"
 
-#: dselect/methparse.cc:193
+#: dselect/methparse.cc
 #, c-format
 msgid "unable to open option description file `%.250s'"
 msgstr "kon bestand met optiebeschrijvingen `%.250s' niet openen"
 
-#: dselect/methparse.cc:197
+#: dselect/methparse.cc
 #, c-format
 msgid "unable to stat option description file `%.250s'"
 msgstr "kon bestand met optiebeschrijvingen `%.250s' niet vinden"
 
-#: dselect/methparse.cc:201
+#: dselect/methparse.cc
 #, c-format
 msgid "failed to read option description file `%.250s'"
 msgstr "kon bestand met optiebeschrijvingen `%.250s' niet lezen"
 
-#: dselect/methparse.cc:204
+#: dselect/methparse.cc
 #, c-format
 msgid "error during read of option description file `%.250s'"
 msgstr "fout bij lezen van bestand met optiebeschrijvingen `%.250s'"
 
-#: dselect/methparse.cc:227
+#: dselect/methparse.cc
 #, c-format
 msgid "error during read of method options file `%.250s'"
 msgstr "fout bij lezen van bestand met methodeopties `%.250s'"
 
-#: dselect/methparse.cc:250
+#: dselect/methparse.cc
 #, c-format
 msgid "unable to open current option file `%.250s'"
 msgstr "kon huidig optiebestand `%.250s' niet openen"
 
-#: dselect/methparse.cc:286
+#: dselect/methparse.cc
 #, c-format
 msgid "unable to write new option to `%.250s'"
 msgstr "kon nieuwe optie niet wegschrijven naar `%.250s'"
 
-#: dselect/pkgdisplay.cc:36
+#: dselect/pkgdisplay.cc
 msgid "new package"
 msgstr "nieuw pakket"
 
-#: dselect/pkgdisplay.cc:37
+#: dselect/pkgdisplay.cc
 msgid "install"
 msgstr "installeer"
 
-#: dselect/pkgdisplay.cc:38
+#: dselect/pkgdisplay.cc
 msgid "hold"
 msgstr "vasthouden"
 
-#: dselect/pkgdisplay.cc:39
+#: dselect/pkgdisplay.cc
 msgid "remove"
 msgstr "verwijder"
 
-#: dselect/pkgdisplay.cc:40
+#: dselect/pkgdisplay.cc
 msgid "purge"
 msgstr "wissen"
 
@@ -1246,327 +1281,321 @@ msgstr "wissen"
 #. * the empty string to store information about the translation. DO NOT
 #. * CHANGE THAT IN A TRANSLATION! The code really relies on that being
 #. * a single space.
-#: dselect/pkgdisplay.cc:47
+#: dselect/pkgdisplay.cc
 msgid " "
 msgstr " "
 
-#: dselect/pkgdisplay.cc:48
+#: dselect/pkgdisplay.cc
 msgid "REINSTALL"
 msgstr "HERINSTALLATIE"
 
-#: dselect/pkgdisplay.cc:51
+#: dselect/pkgdisplay.cc
 msgid "not installed"
 msgstr "niet geïnstalleerd"
 
-#: dselect/pkgdisplay.cc:52
+#: dselect/pkgdisplay.cc
 msgid "removed (configs remain)"
 msgstr "verwijderd (config blijft)"
 
-#: dselect/pkgdisplay.cc:53
+#: dselect/pkgdisplay.cc
 msgid "half installed"
 msgstr "half-geïnstalleerd"
 
-#: dselect/pkgdisplay.cc:54
+#: dselect/pkgdisplay.cc
 msgid "unpacked (not set up)"
 msgstr "uitgepakt (niet ingesteld)"
 
-#: dselect/pkgdisplay.cc:55
+#: dselect/pkgdisplay.cc
 msgid "half configured (config failed)"
 msgstr "half-geconfigureerd (configuratie mislukt)"
 
-#: dselect/pkgdisplay.cc:56
+#: dselect/pkgdisplay.cc
 msgid "awaiting trigger processing"
 msgstr "wacht op verwerking van triggers"
 
-#: dselect/pkgdisplay.cc:57
+#: dselect/pkgdisplay.cc
 msgid "triggered"
 msgstr "trigger aangeroepen"
 
-#: dselect/pkgdisplay.cc:58
+#: dselect/pkgdisplay.cc
 msgid "installed"
 msgstr "geïnstalleerd"
 
-#: dselect/pkgdisplay.cc:61
+#: dselect/pkgdisplay.cc
 msgid "Required"
 msgstr "Vereist"
 
-#: dselect/pkgdisplay.cc:62
+#: dselect/pkgdisplay.cc
 msgid "Important"
 msgstr "Belangrijk"
 
-#: dselect/pkgdisplay.cc:63
+#: dselect/pkgdisplay.cc
 msgid "Standard"
 msgstr "Standaard"
 
-#: dselect/pkgdisplay.cc:64
+#: dselect/pkgdisplay.cc
 msgid "Optional"
 msgstr "Optioneel"
 
-#: dselect/pkgdisplay.cc:65
+#: dselect/pkgdisplay.cc
 msgid "Extra"
 msgstr "Extra"
 
-#: dselect/pkgdisplay.cc:66
-msgid "!Bug!"
-msgstr "!Bug!"
-
-#: dselect/pkgdisplay.cc:67
+#: dselect/pkgdisplay.cc
 msgid "Unclassified"
 msgstr "Ongeclassificeerd"
 
-#: dselect/pkgdisplay.cc:70
+#: dselect/pkgdisplay.cc
 msgid "suggests"
 msgstr "suggereert"
 
-#: dselect/pkgdisplay.cc:71
+#: dselect/pkgdisplay.cc
 msgid "recommends"
 msgstr "raad aan"
 
-#: dselect/pkgdisplay.cc:72
+#: dselect/pkgdisplay.cc
 msgid "depends on"
 msgstr "heeft als vereiste"
 
-#: dselect/pkgdisplay.cc:73
+#: dselect/pkgdisplay.cc
 msgid "pre-depends on"
 msgstr "heeft als voor-vereiste"
 
-#: dselect/pkgdisplay.cc:74
+#: dselect/pkgdisplay.cc
 msgid "breaks"
 msgstr "maakt defect"
 
-#: dselect/pkgdisplay.cc:75
+#: dselect/pkgdisplay.cc
 msgid "conflicts with"
 msgstr "is in strijd met"
 
-#: dselect/pkgdisplay.cc:76
+#: dselect/pkgdisplay.cc
 msgid "provides"
 msgstr "voorziet in"
 
-#: dselect/pkgdisplay.cc:77
+#: dselect/pkgdisplay.cc
 msgid "replaces"
 msgstr "vervangt"
 
-#: dselect/pkgdisplay.cc:78
+#: dselect/pkgdisplay.cc
 msgid "enhances"
 msgstr "verbetert"
 
-#: dselect/pkgdisplay.cc:81
+#: dselect/pkgdisplay.cc
 msgid "Req"
 msgstr "Req"
 
-#: dselect/pkgdisplay.cc:82
+#: dselect/pkgdisplay.cc
 msgid "Imp"
 msgstr "Imp"
 
-#: dselect/pkgdisplay.cc:83
+#: dselect/pkgdisplay.cc
 msgid "Std"
 msgstr "Std"
 
-#: dselect/pkgdisplay.cc:84
+#: dselect/pkgdisplay.cc
 msgid "Opt"
 msgstr "Opt"
 
-#: dselect/pkgdisplay.cc:85
+#: dselect/pkgdisplay.cc
 msgid "Xtr"
 msgstr "Xtr"
 
-#: dselect/pkgdisplay.cc:86
+#: dselect/pkgdisplay.cc
 msgid "bUG"
 msgstr "bUG"
 
-#: dselect/pkgdisplay.cc:87
+#: dselect/pkgdisplay.cc
 msgid "?"
 msgstr "?"
 
-#: dselect/pkgdisplay.cc:95 dselect/pkgdisplay.cc:115
+#: dselect/pkgdisplay.cc
 msgid "Broken"
 msgstr "Defect"
 
-#: dselect/pkgdisplay.cc:96
+#: dselect/pkgdisplay.cc
 msgid "New"
 msgstr "Nieuw"
 
-#: dselect/pkgdisplay.cc:97
-msgid "Updated"
-msgstr "Bijgewerkt"
+#: dselect/pkgdisplay.cc
+msgid "Upgradable"
+msgstr ""
 
-#: dselect/pkgdisplay.cc:98
+#: dselect/pkgdisplay.cc
 msgid "Obsolete/local"
 msgstr "Verouderd/lokaal"
 
-#: dselect/pkgdisplay.cc:99
-msgid "Up-to-date"
-msgstr "Up-to-date"
+#: dselect/pkgdisplay.cc
+msgid "Installed"
+msgstr "Geïnstalleerd"
 
-#: dselect/pkgdisplay.cc:100
+#: dselect/pkgdisplay.cc
 msgid "Available"
 msgstr "Beschikbaar"
 
-#: dselect/pkgdisplay.cc:101 dselect/pkgdisplay.cc:117
+#: dselect/pkgdisplay.cc
 msgid "Removed"
 msgstr "Verwijderd"
 
-#: dselect/pkgdisplay.cc:102 dselect/pkgdisplay.cc:111
+#: dselect/pkgdisplay.cc
 msgid "Brokenly installed packages"
 msgstr "Foutief geïnstalleerde pakketten"
 
-#: dselect/pkgdisplay.cc:103
+#: dselect/pkgdisplay.cc
 msgid "Newly available packages"
 msgstr "Nieuwe beschikbare pakketten"
 
-#: dselect/pkgdisplay.cc:104
-msgid "Updated packages (newer version is available)"
-msgstr "Bijgewerkte pakketten (nieuwe versie is beschikbaar)"
+#: dselect/pkgdisplay.cc
+#, fuzzy
+#| msgid "Newly available packages"
+msgid "Upgradable packages"
+msgstr "Nieuwe beschikbare pakketten"
 
-#: dselect/pkgdisplay.cc:105
-msgid "Obsolete and local packages present on system"
+#: dselect/pkgdisplay.cc
+#, fuzzy
+#| msgid "Obsolete and local packages present on system"
+msgid "Obsolete and locally created packages"
 msgstr "Verouderde en lokale pakketten op het systeem"
 
-#: dselect/pkgdisplay.cc:106
-msgid "Up to date installed packages"
-msgstr "Up-to-date geïnstalleerde pakketten"
+#: dselect/pkgdisplay.cc
+msgid "Installed packages"
+msgstr "Geïnstalleerde pakketten"
 
-#: dselect/pkgdisplay.cc:107
-msgid "Available packages (not currently installed)"
-msgstr "Beschikbare pakketten (niet geïnstalleerd)"
+#: dselect/pkgdisplay.cc
+#, fuzzy
+#| msgid "Up to date installed packages"
+msgid "Available not installed packages"
+msgstr "Up-to-date geïnstalleerde pakketten"
 
-#: dselect/pkgdisplay.cc:108
+#: dselect/pkgdisplay.cc
 msgid "Removed and no longer available packages"
 msgstr "Verwijderde en intussen verouderde pakketten"
 
-#: dselect/pkgdisplay.cc:112
-msgid "Installed packages"
-msgstr "Geïnstalleerde pakketten"
-
-#: dselect/pkgdisplay.cc:113
+#: dselect/pkgdisplay.cc
 msgid "Removed packages (configuration still present)"
 msgstr "Verwijderde pakketten (maar configuratie staat er nog)"
 
-#: dselect/pkgdisplay.cc:114
+#: dselect/pkgdisplay.cc
 msgid "Purged packages and those never installed"
 msgstr "Gewiste of nooit geïnstalleerde pakketten"
 
-#: dselect/pkgdisplay.cc:116
-msgid "Installed"
-msgstr "Geïnstalleerd"
-
-#: dselect/pkgdisplay.cc:118
+#: dselect/pkgdisplay.cc
 msgid "Purged"
 msgstr "Gewist"
 
-#: dselect/pkgdisplay.cc:138
+#: dselect/pkgdisplay.cc
 msgid "Error"
 msgstr "Fout"
 
-#: dselect/pkgdisplay.cc:139
+#: dselect/pkgdisplay.cc
 msgid "Installed?"
 msgstr "Geïnstalleerd?"
 
-#: dselect/pkgdisplay.cc:140
+#: dselect/pkgdisplay.cc
 msgid "Old mark"
 msgstr "Huidig"
 
-#: dselect/pkgdisplay.cc:141
+#: dselect/pkgdisplay.cc
 msgid "Marked for"
 msgstr "Gewenst"
 
-#: dselect/pkgdisplay.cc:143
+#: dselect/pkgdisplay.cc
 msgid "EIOM"
 msgstr "EIOM"
 
-#: dselect/pkgdisplay.cc:147 dselect/pkgdisplay.cc:150
+#: dselect/pkgdisplay.cc
 msgid "Section"
 msgstr "Sectie"
 
-#: dselect/pkgdisplay.cc:148
+#: dselect/pkgdisplay.cc
 msgid "Priority"
 msgstr "Voorrang"
 
-#: dselect/pkgdisplay.cc:152
+#: dselect/pkgdisplay.cc
 msgid "Package"
 msgstr "Pakket"
 
-#: dselect/pkgdisplay.cc:161 dselect/pkgdisplay.cc:165
+#: dselect/pkgdisplay.cc
 msgid "Avail.arch"
 msgstr "Besch.arch"
 
-#: dselect/pkgdisplay.cc:164
+#: dselect/pkgdisplay.cc
 msgid "Inst.arch"
 msgstr "Geïnst.arch"
 
-#: dselect/pkgdisplay.cc:178 dselect/pkgdisplay.cc:182
+#: dselect/pkgdisplay.cc
 msgid "Avail.ver"
 msgstr "Besch.ver"
 
-#: dselect/pkgdisplay.cc:181
+#: dselect/pkgdisplay.cc
 msgid "Inst.ver"
 msgstr "Geïnst.ver"
 
-#: dselect/pkgdisplay.cc:197
+#: dselect/pkgdisplay.cc
 msgid "dselect - recursive package listing"
 msgstr "dselect - recursieve pakketlijst"
 
-#: dselect/pkgdisplay.cc:199
+#: dselect/pkgdisplay.cc
 msgid "dselect - inspection of package states"
 msgstr "dselect - bekijken pakketstatus"
 
-#: dselect/pkgdisplay.cc:200
+#: dselect/pkgdisplay.cc
 msgid "dselect - main package listing"
 msgstr "dselect - hoofd-pakketlijst"
 
-#: dselect/pkgdisplay.cc:208
+#: dselect/pkgdisplay.cc
 msgid " (by section)"
 msgstr " (op sectie)"
 
-#: dselect/pkgdisplay.cc:211
+#: dselect/pkgdisplay.cc
 msgid " (avail., section)"
 msgstr " (besch., sectie)"
 
-#: dselect/pkgdisplay.cc:214
+#: dselect/pkgdisplay.cc
 msgid " (status, section)"
 msgstr " (status, sectie)"
 
-#: dselect/pkgdisplay.cc:223
+#: dselect/pkgdisplay.cc
 msgid " (by priority)"
 msgstr " (op prioriteit)"
 
-#: dselect/pkgdisplay.cc:226
+#: dselect/pkgdisplay.cc
 msgid " (avail., priority)"
 msgstr " (besch., prioriteit)"
 
-#: dselect/pkgdisplay.cc:229
+#: dselect/pkgdisplay.cc
 msgid " (status, priority)"
 msgstr " (status, prioriteit)"
 
-#: dselect/pkgdisplay.cc:238
+#: dselect/pkgdisplay.cc
 msgid " (alphabetically)"
 msgstr " (alfabetisch)"
 
-#: dselect/pkgdisplay.cc:241
+#: dselect/pkgdisplay.cc
 msgid " (by availability)"
 msgstr " (op beschikbaarheid)"
 
-#: dselect/pkgdisplay.cc:244
+#: dselect/pkgdisplay.cc
 msgid " (by status)"
 msgstr " (op status)"
 
-#: dselect/pkgdisplay.cc:259
+#: dselect/pkgdisplay.cc
 msgid " mark:+/=/- terse:v help:?"
 msgstr " markeer:+/=/- kort:v hulp:?"
 
-#: dselect/pkgdisplay.cc:260
+#: dselect/pkgdisplay.cc
 msgid " mark:+/=/- verbose:v help:?"
 msgstr " markeer:+/=/- lang:v hulp:?"
 
-#: dselect/pkgdisplay.cc:262
+#: dselect/pkgdisplay.cc
 msgid " terse:v help:?"
 msgstr " kort:v hulp:?"
 
-#: dselect/pkgdisplay.cc:263
+#: dselect/pkgdisplay.cc
 msgid " verbose:v help:?"
 msgstr " lang:v hulp:?"
 
-#: dselect/pkginfo.cc:85
+#: dselect/pkginfo.cc
 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 "
@@ -1588,80 +1617,110 @@ msgstr ""
 "de mogelijkheid krijgt om pakketten te markeren in verschillende soorten "
 "groepen."
 
-#: dselect/pkginfo.cc:98
+#: dselect/pkginfo.cc
 msgid "Interrelationships"
 msgstr "Onderlinge relaties"
 
-#: dselect/pkginfo.cc:117
+#: dselect/pkginfo.cc
 msgid "No description available."
 msgstr "Geen beschrijving beschikbaar."
 
-#: dselect/pkginfo.cc:135
+#: dselect/pkginfo.cc
 msgid "Installed control file information"
 msgstr "Informatie uit controlebestand 'geïnstalleerde pakketten'"
 
-#: dselect/pkginfo.cc:151
+#: dselect/pkginfo.cc
 msgid "Available control file information"
 msgstr "Informatie uit controlebestand 'beschikbare pakketten'"
 
-#: dselect/pkglist.cc:425
+#: dselect/pkglist.cc
 msgid "there are no packages"
 msgstr "er zijn geen pakketten"
 
-#: dselect/pkglist.cc:521
+#: dselect/pkglist.cc
 msgid "invalid search option given"
 msgstr "ongeldige zoekoptie opgegeven"
 
-#: dselect/pkglist.cc:536
+#: dselect/pkglist.cc
 msgid "error in regular expression"
 msgstr "fout in reguliere expressie"
 
-#: dselect/pkgsublist.cc:111
+#: dselect/pkgsublist.cc
 msgid " does not appear to be available\n"
 msgstr " lijkt niet beschikbaar te zijn\n"
 
-#: dselect/pkgsublist.cc:131
+#: dselect/pkgsublist.cc
 msgid " or "
 msgstr " of "
 
-#: dselect/pkgtop.cc:58
+#: dselect/pkgtop.cc
 msgid "All"
 msgstr "Alles"
 
-#: dselect/pkgtop.cc:80
+#: dselect/pkgtop.cc
 msgid "All packages"
 msgstr "Alle pakketten"
 
-#: dselect/pkgtop.cc:84
+#: dselect/pkgtop.cc
 #, c-format
 msgid "%s packages without a section"
 msgstr "%s pakketten zonder sectie"
 
-#: dselect/pkgtop.cc:86
+#: dselect/pkgtop.cc
 #, c-format
 msgid "%s packages in section %s"
 msgstr "%s pakketten in sectie %s"
 
-#: dselect/pkgtop.cc:92
+#: dselect/pkgtop.cc
 #, c-format
 msgid "%s %s packages"
 msgstr "%s %s pakketten"
 
-#: dselect/pkgtop.cc:96
+#: dselect/pkgtop.cc
 #, c-format
 msgid "%s %s packages without a section"
 msgstr "%s %s pakketten zonder sectie"
 
-#: dselect/pkgtop.cc:98
+#: dselect/pkgtop.cc
 #, c-format
 msgid "%s %s packages in section %s"
 msgstr "%s %s pakketten in sectie %s"
 
-#: dselect/pkgtop.cc:119
+#: dselect/pkgtop.cc
 #, c-format
 msgid "%-*s %s%s%s;  %s (was: %s).  %s"
 msgstr "%-*s %s%s%s;  %s (was: %s).  %s"
 
+#~ msgid "Actions:\n"
+#~ msgstr "Acties:\n"
+
+#~ msgid "Colours:\n"
+#~ msgstr "Kleuren:\n"
+
+#~ msgid "Attributes:\n"
+#~ msgstr "Attributen:\n"
+
+#~ msgid "EOF before option name start"
+#~ msgstr "EOF voor begin optienaam"
+
+#~ msgid "EOF before summary"
+#~ msgstr "EOF voor samenvatting"
+
+#~ msgid "!Bug!"
+#~ msgstr "!Bug!"
+
+#~ msgid "Updated"
+#~ msgstr "Bijgewerkt"
+
+#~ msgid "Up-to-date"
+#~ msgstr "Up-to-date"
+
+#~ msgid "Updated packages (newer version is available)"
+#~ msgstr "Bijgewerkte pakketten (nieuwe versie is beschikbaar)"
+
+#~ msgid "Available packages (not currently installed)"
+#~ msgstr "Beschikbare pakketten (niet geïnstalleerd)"
+
 #~ msgid ""
 #~ "Actions:\n"
 #~ "  access update select install config remove quit\n"
diff --git a/dselect/po/nn.po b/dselect/po/nn.po
index 3bab19dc3..dd84c3f17 100644
--- a/dselect/po/nn.po
+++ b/dselect/po/nn.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dselect 1.17.0\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2014-12-23 18:12+0100\n"
+"POT-Creation-Date: 2015-04-06 09:37+0200\n"
 "PO-Revision-Date: 2006-02-17 08:57+0200\n"
 "Last-Translator: Håvard Korsvoll <korsvoll@skulelinux.no>\n"
 "Language-Team: Norwegian Nynorsk <i18n-nn@lister.ping.uio.no>\n"
@@ -21,29 +21,29 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: KBabel 1.10\n"
 
-#: dselect/basecmds.cc:125
+#: dselect/basecmds.cc
 msgid "Search for ? "
 msgstr "Søk etter ? "
 
-#: dselect/basecmds.cc:149
+#: dselect/basecmds.cc
 msgid "Error: "
 msgstr "Feil: "
 
-#: dselect/basecmds.cc:180
+#: dselect/basecmds.cc
 msgid "Help: "
 msgstr "Hjelp: "
 
-#: dselect/basecmds.cc:186
+#: dselect/basecmds.cc
 msgid "Press ? for help menu, . for next topic, <space> to exit help."
 msgstr ""
 "Trykk ? for å visa hjelpemeny, «.» for neste emne, <mellomrom> for å "
 "avslutta hjelpa."
 
-#: dselect/basecmds.cc:193
+#: dselect/basecmds.cc
 msgid "Help information is available under the following topics:"
 msgstr "Hjelp for følgjande emne er tilgjengeleg:"
 
-#: dselect/basecmds.cc:201
+#: dselect/basecmds.cc
 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. "
@@ -51,243 +51,243 @@ msgstr ""
 "Trykk ein tast frå lista over, <mellomrom> eller «q» for å avslutta hjelp.\n"
 "  eller «.» for å lese kvar hjelpeside etter kvarandre. "
 
-#: dselect/basecmds.cc:207
+#: dselect/basecmds.cc
 msgid "error reading keyboard in help"
 msgstr "feil ved lesing av tastatur i hjelp"
 
-#: dselect/baselist.cc:60
+#: dselect/baselist.cc
 msgid "ioctl(TIOCGWINSZ) failed"
 msgstr "ioctl(TIOCGWINSZ) feila"
 
-#: dselect/baselist.cc:63
+#: dselect/baselist.cc
 msgid "doupdate in SIGWINCH handler failed"
 msgstr "douptade i SIGWINCH-handteraren feila"
 
-#: dselect/baselist.cc:72
+#: dselect/baselist.cc
 msgid "failed to restore old SIGWINCH sigact"
 msgstr "klarte ikkje å gjenoppretta gammal SIGWINCH sigact"
 
-#: dselect/baselist.cc:75
+#: dselect/baselist.cc
 msgid "failed to restore old signal mask"
 msgstr "klarte ikkje gjenoppretta gammal signalmaske"
 
-#: dselect/baselist.cc:86
+#: dselect/baselist.cc
 msgid "failed to get old signal mask"
 msgstr "klarte ikkje henta gammal signalmaske"
 
-#: dselect/baselist.cc:88
+#: dselect/baselist.cc
 msgid "failed to get old SIGWINCH sigact"
 msgstr "klarte ikkje henta gammal SIGWINCH sigact"
 
-#: dselect/baselist.cc:93
+#: dselect/baselist.cc
 msgid "failed to block SIGWINCH"
 msgstr "klarte ikkje blokkera SIGWINCH"
 
-#: dselect/baselist.cc:99
+#: dselect/baselist.cc
 msgid "failed to set new SIGWINCH sigact"
 msgstr "klarte ikkje setja ny SIGWINCH sigact"
 
-#: dselect/baselist.cc:174
+#: dselect/baselist.cc
 msgid "failed to allocate colour pair"
 msgstr "klarte ikkje tilordna fargepar"
 
-#: dselect/baselist.cc:203
+#: dselect/baselist.cc
 msgid "failed to create title window"
 msgstr "klarte ikkje laga tittelvindauge"
 
-#: dselect/baselist.cc:207
+#: dselect/baselist.cc
 msgid "failed to create whatinfo window"
 msgstr "klarte ikkje laga whatinfo-vindauge"
 
-#: dselect/baselist.cc:211
+#: dselect/baselist.cc
 msgid "failed to create baselist pad"
 msgstr "klarte ikkje laga baselist-pad"
 
-#: dselect/baselist.cc:214
+#: dselect/baselist.cc
 msgid "failed to create heading pad"
 msgstr "klarte ikkje laga heading-pad"
 
-#: dselect/baselist.cc:218
+#: dselect/baselist.cc
 msgid "failed to create thisstate pad"
 msgstr "klarte ikkje laga thisstate-pad"
 
-#: dselect/baselist.cc:222
+#: dselect/baselist.cc
 msgid "failed to create info pad"
 msgstr "klarte ikkje laga info-pad"
 
-#: dselect/baselist.cc:227
+#: dselect/baselist.cc
 msgid "failed to create query window"
 msgstr "klarte ikkje laga spørjingsvindauge"
 
-#: dselect/baselist.cc:298
+#: dselect/baselist.cc
 #, fuzzy
 msgid "Keybindings"
 msgstr "snøggtastar"
 
-#: dselect/baselist.cc:347
+#: dselect/baselist.cc
 #, c-format
 msgid "  -- %d%%, press "
 msgstr "  -- %d%%, trykk "
 
-#: dselect/baselist.cc:350
+#: dselect/baselist.cc
 #, c-format
 msgid "%s for more"
 msgstr "%s for meir"
 
-#: dselect/baselist.cc:354
+#: dselect/baselist.cc
 #, c-format
 msgid "%s to go back"
 msgstr "%s for å gå tilbake"
 
-#: dselect/bindings.cc:78
+#: dselect/bindings.cc
 msgid "[not bound]"
 msgstr "[ikkje avgrensa]"
 
-#: dselect/bindings.cc:82
+#: dselect/bindings.cc
 #, c-format
 msgid "[unk: %d]"
 msgstr "[ukjend: %d]"
 
-#: dselect/bindings.cc:141
+#: dselect/bindings.cc
 msgid "Scroll onwards through help/information"
 msgstr "Gå vidare gjennom hjelp/informasjon"
 
-#: dselect/bindings.cc:142
+#: dselect/bindings.cc
 msgid "Scroll backwards through help/information"
 msgstr "Gå bakover gjennom hjelp/informasjon"
 
-#: dselect/bindings.cc:143
+#: dselect/bindings.cc
 msgid "Move up"
 msgstr "Flytt opp"
 
-#: dselect/bindings.cc:144
+#: dselect/bindings.cc
 msgid "Move down"
 msgstr "Flytt ned"
 
-#: dselect/bindings.cc:145
+#: dselect/bindings.cc
 msgid "Go to top of list"
 msgstr "Gå til toppen av lista"
 
-#: dselect/bindings.cc:146
+#: dselect/bindings.cc
 msgid "Go to end of list"
 msgstr "Gå til slutten av lista"
 
-#: dselect/bindings.cc:147
+#: dselect/bindings.cc
 msgid "Request help (cycle through help screens)"
 msgstr "Be om hjelp (gå gjennom hjelpesidene)"
 
-#: dselect/bindings.cc:148
+#: dselect/bindings.cc
 msgid "Cycle through information displays"
 msgstr "Gå gjennom informasjonssidene"
 
-#: dselect/bindings.cc:149
+#: dselect/bindings.cc
 msgid "Redraw display"
 msgstr "Teikn sida på ny"
 
-#: dselect/bindings.cc:150
+#: dselect/bindings.cc
 msgid "Scroll onwards through list by 1 line"
 msgstr "Gå vidare gjennom lista med ei linje"
 
-#: dselect/bindings.cc:151
+#: dselect/bindings.cc
 msgid "Scroll backwards through list by 1 line"
 msgstr "Gå bakover gjennom lista med ei linje"
 
-#: dselect/bindings.cc:152
+#: dselect/bindings.cc
 msgid "Scroll onwards through help/information by 1 line"
 msgstr "Gå vidare gjennom hjelp/informasjon med ei linje"
 
-#: dselect/bindings.cc:153
+#: dselect/bindings.cc
 msgid "Scroll backwards through help/information by 1 line"
 msgstr "Gå bakover gjennom hjelp/informasjon med ei linje"
 
-#: dselect/bindings.cc:154
+#: dselect/bindings.cc
 msgid "Scroll onwards through list"
 msgstr "Gå vidare gjennom lista"
 
-#: dselect/bindings.cc:155
+#: dselect/bindings.cc
 msgid "Scroll backwards through list"
 msgstr "Gå bakover gjennom lista"
 
-#: dselect/bindings.cc:158
+#: dselect/bindings.cc
 msgid "Mark package(s) for installation"
 msgstr "Merk pakkar for installasjon"
 
-#: dselect/bindings.cc:159
+#: dselect/bindings.cc
 msgid "Mark package(s) for deinstallation"
 msgstr "Merk pakkar for avinstallasjon"
 
-#: dselect/bindings.cc:160
+#: dselect/bindings.cc
 msgid "Mark package(s) for deinstall and purge"
 msgstr "Merk pakkar for avinstallasjon og slett"
 
-#: dselect/bindings.cc:161
+#: dselect/bindings.cc
 msgid "Make highlight more specific"
 msgstr "Gjer utheving meir spesifikk"
 
-#: dselect/bindings.cc:162
+#: dselect/bindings.cc
 msgid "Make highlight less specific"
 msgstr "Gjer utheving mindre spesifikk"
 
-#: dselect/bindings.cc:163
+#: dselect/bindings.cc
 msgid "Search for a package whose name contains a string"
 msgstr "Søk etter ein pakke som har eit namn som inneheld ein streng"
 
-#: dselect/bindings.cc:164
+#: dselect/bindings.cc
 #, fuzzy
 #| msgid "Repeat last search."
 msgid "Repeat last search"
 msgstr "Gjer om at førre søk"
 
-#: dselect/bindings.cc:165
+#: dselect/bindings.cc
 msgid "Swap sort order priority/section"
 msgstr "Byt om sorteringsrekkjefølgje prioritet/seksjon"
 
-#: dselect/bindings.cc:166
+#: dselect/bindings.cc
 msgid "Quit, confirming, and checking dependencies"
 msgstr "Avslutt, stadfesting og sjekk pakkekrav"
 
-#: dselect/bindings.cc:167
+#: dselect/bindings.cc
 msgid "Quit, confirming without check"
 msgstr "Avslutt, stadfesting utan sjekk"
 
-#: dselect/bindings.cc:168
+#: dselect/bindings.cc
 msgid "Quit, rejecting conflict/dependency suggestions"
 msgstr "Avslutt, avvis framlegg for konflikt/pakkekrav"
 
-#: dselect/bindings.cc:169
+#: dselect/bindings.cc
 msgid "Abort - quit without making changes"
 msgstr "Avbryt - avslutt utan å gjera endringar"
 
-#: dselect/bindings.cc:170
+#: dselect/bindings.cc
 msgid "Revert to old state for all packages"
 msgstr "Gå tilbake til gammal tilstand for alle pakkar"
 
-#: dselect/bindings.cc:171
+#: dselect/bindings.cc
 msgid "Revert to suggested state for all packages"
 msgstr "Gå tilbake til føreslått tilstand for alle pakkar"
 
-#: dselect/bindings.cc:172
+#: dselect/bindings.cc
 msgid "Revert to directly requested state for all packages"
 msgstr "Gå tilbake til direkte føreslått tilstand for alle pakkar"
 
-#: dselect/bindings.cc:173
+#: dselect/bindings.cc
 #, fuzzy
 msgid "Revert to currently installed state for all packages"
 msgstr "Gå tilbake til direkte føreslått tilstand for alle pakkar"
 
-#: dselect/bindings.cc:176
+#: dselect/bindings.cc
 msgid "Select currently-highlighted access method"
 msgstr "Vel den utheva tilgangsmetoden"
 
-#: dselect/bindings.cc:177
+#: dselect/bindings.cc
 msgid "Quit without changing selected access method"
 msgstr "Avslutt utan å endra den valde tilgangsmetoden"
 
-#: dselect/helpmsgs.cc:29
+#: dselect/helpmsgs.cc
 msgid "Keystrokes"
 msgstr "Tastar"
 
-#: dselect/helpmsgs.cc:29
+#: dselect/helpmsgs.cc
 #, fuzzy
 msgid ""
 "Motion keys: Next/Previous, Top/End, Up/Down, Backwards/Forwards:\n"
@@ -346,11 +346,11 @@ msgstr ""
 "avbryt)\n"
 "   D     set alle til direkte førespurd status     n, \\ siste søk om att\n"
 
-#: dselect/helpmsgs.cc:55
+#: dselect/helpmsgs.cc
 msgid "Introduction to package selections"
 msgstr "Introduksjon til pakkeval"
 
-#: dselect/helpmsgs.cc:55
+#: dselect/helpmsgs.cc
 msgid ""
 "Welcome to dselect's main package listing.\n"
 "\n"
@@ -409,11 +409,11 @@ msgstr ""
 "\n"
 "Trykk <mellomrom> for å avslutta hjelpa og gå til lista no.\n"
 
-#: dselect/helpmsgs.cc:80
+#: dselect/helpmsgs.cc
 msgid "Introduction to read-only package list browser"
 msgstr "Introduksjon til skriveverna pakkeliste"
 
-#: dselect/helpmsgs.cc:80
+#: dselect/helpmsgs.cc
 msgid ""
 "Welcome to dselect's main package listing.\n"
 "\n"
@@ -448,11 +448,11 @@ msgstr ""
 "\n"
 "Trykk <mellomrom> for å avslutta hjelpa og gå til lista no.\n"
 
-#: dselect/helpmsgs.cc:99
+#: dselect/helpmsgs.cc
 msgid "Introduction to conflict/dependency resolution sub-list"
 msgstr "Introduksjon til eiga liste for løysing av konflikt eller pakkekrav"
 
-#: dselect/helpmsgs.cc:99
+#: dselect/helpmsgs.cc
 msgid ""
 "Dependency/conflict resolution - introduction.\n"
 "\n"
@@ -513,11 +513,11 @@ msgstr ""
 "Trykk <mellomrom> for å avslutta hjelpa og gå til lista. \n"
 "Hugs at du kan få hjelp med «?».\n"
 
-#: dselect/helpmsgs.cc:125
+#: dselect/helpmsgs.cc
 msgid "Display, part 1: package listing and status chars"
 msgstr "Skjermbilete, del 1: Pakkeliste og statusteikn"
 
-#: dselect/helpmsgs.cc:125
+#: dselect/helpmsgs.cc
 #, fuzzy
 msgid ""
 "The top half of the screen shows a list of packages.  For each package you "
@@ -580,11 +580,11 @@ msgstr ""
 "installerte og tilgjengelege versjonar (vis/gøym med Shift + V) og \n"
 "ei kort skildring.\n"
 
-#: dselect/helpmsgs.cc:152
+#: dselect/helpmsgs.cc
 msgid "Display, part 2: list highlight; information display"
 msgstr "Skjermbilete, del 2: Listemarkering, informasjonsvising"
 
-#: dselect/helpmsgs.cc:152
+#: dselect/helpmsgs.cc
 msgid ""
 "* Highlight: One line in the package list will be highlighted.  It "
 "indicates\n"
@@ -632,11 +632,11 @@ msgstr ""
 "informasjonsfeltet \n"
 "eller utvida det slik at det dekkjer nesten heile skjermen.\n"
 
-#: dselect/helpmsgs.cc:176
+#: dselect/helpmsgs.cc
 msgid "Introduction to method selection display"
 msgstr "Introduksjon til metodeval"
 
-#: dselect/helpmsgs.cc:176
+#: dselect/helpmsgs.cc
 msgid ""
 "dselect and dpkg can do automatic installation, loading the package files to "
 "be\n"
@@ -678,11 +678,11 @@ msgstr ""
 "Du kan sjå heile lista over tastetrykk ved å trykkja på «k» no eller frå \n"
 "hjelpemenyen som du får når du trykkjer «?».\n"
 
-#: dselect/helpmsgs.cc:196
+#: dselect/helpmsgs.cc
 msgid "Keystrokes for method selection"
 msgstr "Tastetrykk for metodeval"
 
-#: dselect/helpmsgs.cc:196
+#: dselect/helpmsgs.cc
 #, fuzzy
 msgid ""
 "Motion keys: Next/Previous, Top/End, Up/Down, Backwards/Forwards:\n"
@@ -728,104 +728,104 @@ msgstr ""
 "  /                søk (bruk Enter til å avbryta med ein gong)\n"
 "  \\                siste søk om att\n"
 
-#: dselect/main.cc:63
+#: dselect/main.cc
 msgid "Type dselect --help for help."
 msgstr "Skriv «dselect --help» for hjelp."
 
-#: dselect/main.cc:145
+#: dselect/main.cc
 msgid "a"
 msgstr "t"
 
-#: dselect/main.cc:145
+#: dselect/main.cc
 msgid "[A]ccess"
 msgstr "[T]ilgang"
 
-#: dselect/main.cc:145
+#: dselect/main.cc
 msgid "Choose the access method to use."
 msgstr "Vel tilgangsmetoden som skal brukast"
 
-#: dselect/main.cc:146
+#: dselect/main.cc
 msgid "u"
 msgstr "o"
 
-#: dselect/main.cc:146
+#: dselect/main.cc
 msgid "[U]pdate"
 msgstr "[O]ppdater"
 
-#: dselect/main.cc:146
+#: dselect/main.cc
 msgid "Update list of available packages, if possible."
 msgstr "Oppdater liste over tilgjengelege pakkar, viss mogeleg."
 
-#: dselect/main.cc:147
+#: dselect/main.cc
 msgid "s"
 msgstr "v"
 
-#: dselect/main.cc:147
+#: dselect/main.cc
 msgid "[S]elect"
 msgstr "[V]el"
 
-#: dselect/main.cc:147
+#: dselect/main.cc
 msgid "Request which packages you want on your system."
 msgstr "Be om dei pakkane du vil ha på systemet."
 
-#: dselect/main.cc:148
+#: dselect/main.cc
 msgid "i"
 msgstr "i"
 
-#: dselect/main.cc:148
+#: dselect/main.cc
 msgid "[I]nstall"
 msgstr "[I]nstaller"
 
-#: dselect/main.cc:148
+#: dselect/main.cc
 msgid "Install and upgrade wanted packages."
 msgstr "Installer og oppgrader dei valde pakkane."
 
-#: dselect/main.cc:149
+#: dselect/main.cc
 msgid "c"
 msgstr "s"
 
-#: dselect/main.cc:149
+#: dselect/main.cc
 msgid "[C]onfig"
 msgstr "[S]et opp"
 
-#: dselect/main.cc:149
+#: dselect/main.cc
 msgid "Configure any packages that are unconfigured."
 msgstr "Set opp pakkar som ikkje er sett opp."
 
-#: dselect/main.cc:150
+#: dselect/main.cc
 msgid "r"
 msgstr "f"
 
-#: dselect/main.cc:150
+#: dselect/main.cc
 msgid "[R]emove"
 msgstr "[F]jern"
 
-#: dselect/main.cc:150
+#: dselect/main.cc
 msgid "Remove unwanted software."
 msgstr "Fjern uønskte program."
 
-#: dselect/main.cc:151
+#: dselect/main.cc
 msgid "q"
 msgstr "a"
 
-#: dselect/main.cc:151
+#: dselect/main.cc
 msgid "[Q]uit"
 msgstr "[A]vslutt"
 
-#: dselect/main.cc:151
+#: dselect/main.cc
 msgid "Quit dselect."
 msgstr "Avsluttar dselect."
 
-#: dselect/main.cc:152
+#: dselect/main.cc
 msgid "menu"
 msgstr "meny"
 
-#: dselect/main.cc:157
+#: dselect/main.cc
 #, fuzzy, c-format
 msgid "Debian `%s' package handling frontend version %s.\n"
 msgstr "Debian `%s', brukargrensesnitt for pakkehandtering."
 
-#: dselect/main.cc:160
+#: dselect/main.cc
 #, fuzzy
 msgid ""
 "This is free software; see the GNU General Public License version 2 or\n"
@@ -835,96 +835,103 @@ msgstr ""
 "GNU General Public License versjon 2 eller nyare. Det finst INGEN garanti.\n"
 "Sjå «dpkg-deb --licence» for detaljar.\n"
 
-#: dselect/main.cc:169 dselect/main.cc:217
+#: dselect/main.cc
 msgid "<standard output>"
 msgstr ""
 
-#: dselect/main.cc:180
+#: dselect/main.cc
 #, c-format
 msgid ""
-"Usage: %s [<option> ...] [<action> ...]\n"
+"Usage: %s [<option>...] [<command>...]\n"
 "\n"
 msgstr ""
 
-#: dselect/main.cc:184
+#: dselect/main.cc
+#, c-format
+msgid "Commands:\n"
+msgstr ""
+
+#: dselect/main.cc
 #, c-format
 msgid ""
 "Options:\n"
-"  --admindir <directory>     Use <directory> instead of %s.\n"
-"  --expert                   Turn on expert mode.\n"
-"  --debug <file> | -D<file>  Turn on debugging, sending output to <file>.\n"
-"  --colour | --color screenpart:[foreground],[background][:attr[+attr+...]]\n"
-"                             Configure screen colours.\n"
-"\n"
+"      --admindir <directory>       Use <directory> instead of %s.\n"
+"      --expert                     Turn on expert mode.\n"
+"  -D, --debug <file>               Turn on debugging, send output to "
+"<file>.\n"
+"      --color <color-spec>         Configure screen colors.\n"
+"      --colour <color-spec>        Ditto.\n"
 msgstr ""
 
-#: dselect/main.cc:193
+#: dselect/main.cc
 #, c-format
 msgid ""
-"  --help                     Show this help message.\n"
-"  --version                  Show the version.\n"
+"  -?, --help                       Show this help message.\n"
+"      --version                    Show the version.\n"
 "\n"
 msgstr ""
 
-#: dselect/main.cc:197
-#, fuzzy, c-format
-#| msgid "Section"
-msgid "Actions:\n"
-msgstr "Del"
-
-#: dselect/main.cc:202
+#: dselect/main.cc
 #, c-format
-msgid "Screenparts:\n"
+msgid ""
+"<color-spec> is <screen-part>:[<foreground>],[<background>][:"
+"<attr>[+<attr>]...]\n"
+msgstr ""
+
+#: dselect/main.cc
+#, fuzzy, c-format
+#| msgid "Screenparts:\n"
+msgid "<screen-part> is:"
 msgstr "Skjermdelar:\n"
 
-#: dselect/main.cc:207
+#: dselect/main.cc
 #, c-format
-msgid "Colours:\n"
-msgstr "Fargar:\n"
+msgid "<color> is:"
+msgstr ""
 
-#: dselect/main.cc:212
+#: dselect/main.cc
 #, c-format
-msgid "Attributes:\n"
-msgstr "Attributtar:\n"
+msgid "<attr> is:"
+msgstr ""
 
-#: dselect/main.cc:232
+#: dselect/main.cc
 #, c-format
 msgid "couldn't open debug file `%.255s'\n"
 msgstr "klarte ikkje opna avlusingsfil `%.255s'\n"
 
-#: dselect/main.cc:253
+#: dselect/main.cc
 #, fuzzy, c-format
 #| msgid "Invalid %s `%s'\n"
 msgid "invalid %s '%s'"
 msgstr "Ugyldig %s `%s'\n"
 
-#: dselect/main.cc:272
+#: dselect/main.cc
 msgid "screen part"
 msgstr "skjermdel"
 
-#: dselect/main.cc:278
+#: dselect/main.cc
 #, fuzzy
 #| msgid "Null colour specification\n"
 msgid "null colour specification"
 msgstr "Ingen fargespesifikasjon\n"
 
-#: dselect/main.cc:286 dselect/main.cc:291
+#: dselect/main.cc
 msgid "colour"
 msgstr "farge"
 
-#: dselect/main.cc:299
+#: dselect/main.cc
 msgid "colour attribute"
 msgstr "fargeattributt"
 
-#: dselect/main.cc:333
+#: dselect/main.cc
 msgid "Terminal does not appear to support cursor addressing.\n"
 msgstr "Terminalen ser ikkje ut til å støtta markøradressering.\n"
 
-#: dselect/main.cc:335
+#: dselect/main.cc
 msgid "Terminal does not appear to support highlighting.\n"
 msgstr "Terminalen ser ikkje ut til å støtta utheving.\n"
 
-#: dselect/main.cc:337
+#: dselect/main.cc
 #, fuzzy, c-format
 msgid ""
 "Set your TERM variable correctly, use a better terminal,\n"
@@ -933,11 +940,11 @@ msgstr ""
 "Set TERM-variabelen rett, bruk ein betre terminal eller \n"
 "du lyt klare deg med handteringsverktøyet for kvar pakke "
 
-#: dselect/main.cc:340
+#: dselect/main.cc
 msgid "terminal lacks necessary features, giving up"
 msgstr "terminalen manglar nødvendige funksjonar, gjev opp"
 
-#: dselect/main.cc:425
+#: dselect/main.cc
 msgid ""
 "\n"
 "\n"
@@ -952,13 +959,13 @@ msgstr ""
 "Trykk <enter> for å stadfesta utvalet.   ^L teiknar skjermen på ny.\n"
 "\n"
 
-#: dselect/main.cc:430
+#: dselect/main.cc
 msgid ""
 "Copyright (C) 1994-1996 Ian Jackson.\n"
 "Copyright (C) 2000,2001 Wichert Akkerman.\n"
 msgstr ""
 
-#: dselect/main.cc:436
+#: dselect/main.cc
 msgid ""
 "\n"
 "\n"
@@ -968,58 +975,58 @@ msgstr ""
 "\n"
 "Skriveverna tilgang: berre førehandsvising av utval er tilgjengeleg!"
 
-#: dselect/main.cc:455
+#: dselect/main.cc
 msgid "failed to getch in main menu"
 msgstr "klarte ikkje bruka «getch» i hovedmenyen"
 
-#: dselect/main.cc:538
+#: dselect/main.cc
 #, c-format
 msgid "unknown action string `%.50s'"
 msgstr "ukjent handlingsstreng `%.50s'"
 
-#: dselect/methlist.cc:66
+#: dselect/methlist.cc
 msgid "Abbrev."
 msgstr "Forkort."
 
-#: dselect/methlist.cc:67 dselect/pkgdisplay.cc:188 dselect/pkginfo.cc:110
+#: dselect/methlist.cc dselect/pkgdisplay.cc dselect/pkginfo.cc
 msgid "Description"
 msgstr "Skildring"
 
-#: dselect/methlist.cc:73
+#: dselect/methlist.cc
 msgid "dselect - list of access methods"
 msgstr "dselect - liste over tilgangsmetodar"
 
-#: dselect/methlist.cc:82
+#: dselect/methlist.cc
 #, c-format
 msgid "Access method `%s'."
 msgstr "Tilgangsmetode `%s'."
 
-#: dselect/methlist.cc:161 dselect/pkglist.cc:587
+#: dselect/methlist.cc dselect/pkglist.cc
 msgid "doupdate failed"
 msgstr "«doupdate» feila"
 
-#: dselect/methlist.cc:164 dselect/pkglist.cc:590
+#: dselect/methlist.cc dselect/pkglist.cc
 msgid "failed to unblock SIGWINCH"
 msgstr "klarte ikkje avblokkera SIGWINCH"
 
-#: dselect/methlist.cc:169 dselect/pkglist.cc:595
+#: dselect/methlist.cc dselect/pkglist.cc
 msgid "failed to re-block SIGWINCH"
 msgstr "klarte ikkje reblokkera SIGWINCH"
 
-#: dselect/methlist.cc:170 dselect/pkglist.cc:597
+#: dselect/methlist.cc dselect/pkglist.cc
 msgid "getch failed"
 msgstr "«getch» feila"
 
-#: dselect/methlist.cc:187
+#: dselect/methlist.cc
 #, fuzzy
 msgid "Explanation"
 msgstr "forklaring på "
 
-#: dselect/methlist.cc:197
+#: dselect/methlist.cc
 msgid "No explanation available."
 msgstr "Ingen forklaring tilgjengeleg."
 
-#: dselect/method.cc:67
+#: dselect/method.cc
 #, c-format
 msgid ""
 "\n"
@@ -1030,7 +1037,7 @@ msgstr ""
 "\n"
 "%s: %s\n"
 
-#: dselect/method.cc:70
+#: dselect/method.cc
 msgid ""
 "\n"
 "Press <enter> to continue."
@@ -1038,192 +1045,202 @@ msgstr ""
 "\n"
 "Trykk <enter> for å halda fram."
 
-#: dselect/method.cc:82
+#: dselect/method.cc
 msgid "cannot unlock access method area"
 msgstr ""
 
-#: dselect/method.cc:96
+#: dselect/method.cc
 #, fuzzy
 #| msgid " does not appear to be available\n"
 msgid "no access methods are available"
 msgstr " ser ikkje ut til å vera tilgjengeleg\n"
 
-#: dselect/method.cc:115
+#: dselect/method.cc
 msgid "requested operation requires superuser privilege"
 msgstr ""
 
-#: dselect/method.cc:118
+#: dselect/method.cc
 #, fuzzy
 #| msgid "Choose the access method to use."
 msgid "cannot open or create access method lockfile"
 msgstr "Vel tilgangsmetoden som skal brukast"
 
-#: dselect/method.cc:125
+#: dselect/method.cc
 msgid "the access method area is already locked"
 msgstr ""
 
-#: dselect/method.cc:128
+#: dselect/method.cc
 #, fuzzy
 #| msgid "dselect - list of access methods"
 msgid "cannot lock access method area"
 msgstr "dselect - liste over tilgangsmetodar"
 
-#: dselect/method.cc:161
+#: dselect/method.cc
 #, c-format
 msgid "Press <enter> to continue.\n"
 msgstr "Trykk Enter for å halda fram.\n"
 
-#: dselect/method.cc:162
+#: dselect/method.cc
 #, fuzzy
 msgid "<standard error>"
 msgstr "skrivefeil på standard-feil"
 
-#: dselect/method.cc:165
+#: dselect/method.cc
 msgid "error reading acknowledgement of program failure message"
 msgstr "feil ved lesing av godkjenning av programfeilmelding"
 
-#: dselect/method.cc:187
+#: dselect/method.cc
 msgid "no access method is selected or configured"
 msgstr ""
 
-#: dselect/method.cc:196
+#: dselect/method.cc
 msgid "update available list script"
 msgstr "skript til oppdatering av tilgjengeliste"
 
-#: dselect/method.cc:200
+#: dselect/method.cc
 msgid "installation script"
 msgstr "installasjonsskript"
 
-#: dselect/method.cc:246
+#: dselect/method.cc
 msgid "query/setup script"
 msgstr "skript til spørjing/oppsett"
 
-#: dselect/methparse.cc:53
+#: dselect/methparse.cc
 #, c-format
 msgid "syntax error in method options file `%.250s' -- %s"
 msgstr "syntaksfeil i metodevalfila «%.250s» -- %s"
 
-#: dselect/methparse.cc:59
+#: dselect/methparse.cc
 #, c-format
 msgid "error reading options file `%.250s'"
 msgstr "feil ved lesing av valfila «%.250s»"
 
-#: dselect/methparse.cc:93
+#: dselect/methparse.cc
 #, c-format
 msgid "unable to read `%.250s' directory for reading methods"
 msgstr "klarte ikkje lesa katalogen «%.250s» for lesing av metodar"
 
-#: dselect/methparse.cc:109
+#: dselect/methparse.cc
 #, c-format
 msgid "method `%.250s' has name that is too long (%d > %d characters)"
 msgstr "metoden «%.250s» har for langt namn (%d > %d teikn)"
 
-#: dselect/methparse.cc:120
+#: dselect/methparse.cc
 #, c-format
 msgid "unable to access method script `%.250s'"
 msgstr "fekk ikkje tilgang til metodeskriptet «%.250s»"
 
-#: dselect/methparse.cc:126
+#: dselect/methparse.cc
 #, c-format
 msgid "unable to read method options file `%.250s'"
 msgstr "klarte ikkje lesa metodevalfila «%.250s»"
 
-#: dselect/methparse.cc:150
+#: dselect/methparse.cc
 msgid "non-digit where digit wanted"
 msgstr "ikkje-tal der det skulle vera eit tal"
 
-#: dselect/methparse.cc:153
-msgid "EOF in index string"
+#: dselect/methparse.cc
+#, fuzzy
+#| msgid "EOF in index string"
+msgid "end of file in index string"
 msgstr "slutt-på-fil i indeksstreng"
 
-#: dselect/methparse.cc:156
+#: dselect/methparse.cc
 msgid "index string too long"
 msgstr "for lang indeksstreng"
 
-#: dselect/methparse.cc:159
+#: dselect/methparse.cc
 msgid "newline before option name start"
 msgstr "linjeskift før starten på valnamnet"
 
-#: dselect/methparse.cc:161
-msgid "EOF before option name start"
-msgstr "slutt-på-fil før starten på valnamnet"
+#: dselect/methparse.cc
+#, fuzzy
+#| msgid "newline before option name start"
+msgid "end of file before option name start"
+msgstr "linjeskift før starten på valnamnet"
 
-#: dselect/methparse.cc:165
+#: dselect/methparse.cc
 msgid "nonalpha where option name start wanted"
 msgstr "ikkje-bokstav der eit valnamn skulle starta"
 
-#: dselect/methparse.cc:167
+#: dselect/methparse.cc
 msgid "non-alphanum in option name"
 msgstr "valnamnet inneheld teikn som ikkje er tal eller bokstavar"
 
-#: dselect/methparse.cc:170
-msgid "EOF in option name"
+#: dselect/methparse.cc
+#, fuzzy
+#| msgid "EOF in option name"
+msgid "end of file in option name"
 msgstr "slutt-på-fil i valnamn"
 
-#: dselect/methparse.cc:175
+#: dselect/methparse.cc
 msgid "newline before summary"
 msgstr "linjeskift før skildringa"
 
-#: dselect/methparse.cc:177
-msgid "EOF before summary"
-msgstr "slutt-på-fil før skildringa"
+#: dselect/methparse.cc
+#, fuzzy
+#| msgid "newline before summary"
+msgid "end of file before summary"
+msgstr "linjeskift før skildringa"
 
-#: dselect/methparse.cc:183
-msgid "EOF in summary - missing newline"
+#: dselect/methparse.cc
+#, fuzzy
+#| msgid "EOF in summary - missing newline"
+msgid "end of file in summary - missing newline"
 msgstr "slutt-på-fil i skildringa - manglar linjeskift"
 
-#: dselect/methparse.cc:193
+#: dselect/methparse.cc
 #, c-format
 msgid "unable to open option description file `%.250s'"
 msgstr "klarte ikkje opna valskildringsfila «%.250s»"
 
-#: dselect/methparse.cc:197
+#: dselect/methparse.cc
 #, c-format
 msgid "unable to stat option description file `%.250s'"
 msgstr "fann ikkje valskildringsfila «%.250s»"
 
-#: dselect/methparse.cc:201
+#: dselect/methparse.cc
 #, c-format
 msgid "failed to read option description file `%.250s'"
 msgstr "klarte ikkje lesa valskildringsfila «%.250s»"
 
-#: dselect/methparse.cc:204
+#: dselect/methparse.cc
 #, c-format
 msgid "error during read of option description file `%.250s'"
 msgstr "feil ved lesing av valskildringsfila «%.250s»"
 
-#: dselect/methparse.cc:227
+#: dselect/methparse.cc
 #, c-format
 msgid "error during read of method options file `%.250s'"
 msgstr "feil ved lesing av metodevalfila «%.250s»"
 
-#: dselect/methparse.cc:250
+#: dselect/methparse.cc
 #, c-format
 msgid "unable to open current option file `%.250s'"
 msgstr "klarte ikkje opna valfila «%.250s»"
 
-#: dselect/methparse.cc:286
+#: dselect/methparse.cc
 #, c-format
 msgid "unable to write new option to `%.250s'"
 msgstr "klarte ikkje skriva den nye valfila «%.250s»"
 
-#: dselect/pkgdisplay.cc:36
+#: dselect/pkgdisplay.cc
 msgid "new package"
 msgstr "ny pakke"
 
-#: dselect/pkgdisplay.cc:37
+#: dselect/pkgdisplay.cc
 msgid "install"
 msgstr "installer"
 
-#: dselect/pkgdisplay.cc:38
+#: dselect/pkgdisplay.cc
 msgid "hold"
 msgstr "hald tilbake"
 
-#: dselect/pkgdisplay.cc:39
+#: dselect/pkgdisplay.cc
 msgid "remove"
 msgstr "fjern"
 
-#: dselect/pkgdisplay.cc:40
+#: dselect/pkgdisplay.cc
 msgid "purge"
 msgstr "reinsk"
 
@@ -1231,331 +1248,325 @@ msgstr "reinsk"
 #. * the empty string to store information about the translation. DO NOT
 #. * CHANGE THAT IN A TRANSLATION! The code really relies on that being
 #. * a single space.
-#: dselect/pkgdisplay.cc:47
+#: dselect/pkgdisplay.cc
 msgid " "
 msgstr " "
 
-#: dselect/pkgdisplay.cc:48
+#: dselect/pkgdisplay.cc
 msgid "REINSTALL"
 msgstr "INSTALLER OM ATT"
 
-#: dselect/pkgdisplay.cc:51
+#: dselect/pkgdisplay.cc
 msgid "not installed"
 msgstr "ikkje installert"
 
-#: dselect/pkgdisplay.cc:52
+#: dselect/pkgdisplay.cc
 msgid "removed (configs remain)"
 msgstr "fjerna (teke vare på oppsett)"
 
-#: dselect/pkgdisplay.cc:53
+#: dselect/pkgdisplay.cc
 msgid "half installed"
 msgstr "halvinstallert"
 
-#: dselect/pkgdisplay.cc:54
+#: dselect/pkgdisplay.cc
 msgid "unpacked (not set up)"
 msgstr "utpakka (ikkje sett opp)"
 
-#: dselect/pkgdisplay.cc:55
+#: dselect/pkgdisplay.cc
 msgid "half configured (config failed)"
 msgstr ""
 
-#: dselect/pkgdisplay.cc:56
+#: dselect/pkgdisplay.cc
 msgid "awaiting trigger processing"
 msgstr ""
 
-#: dselect/pkgdisplay.cc:57
+#: dselect/pkgdisplay.cc
 msgid "triggered"
 msgstr ""
 
-#: dselect/pkgdisplay.cc:58
+#: dselect/pkgdisplay.cc
 msgid "installed"
 msgstr "installert"
 
-#: dselect/pkgdisplay.cc:61
+#: dselect/pkgdisplay.cc
 msgid "Required"
 msgstr "Påkravd"
 
-#: dselect/pkgdisplay.cc:62
+#: dselect/pkgdisplay.cc
 msgid "Important"
 msgstr "Viktig"
 
-#: dselect/pkgdisplay.cc:63
+#: dselect/pkgdisplay.cc
 msgid "Standard"
 msgstr "Standard"
 
-#: dselect/pkgdisplay.cc:64
+#: dselect/pkgdisplay.cc
 msgid "Optional"
 msgstr "Valfri"
 
-#: dselect/pkgdisplay.cc:65
+#: dselect/pkgdisplay.cc
 msgid "Extra"
 msgstr "Ekstra"
 
-#: dselect/pkgdisplay.cc:66
-msgid "!Bug!"
-msgstr "!Lus!"
-
-#: dselect/pkgdisplay.cc:67
+#: dselect/pkgdisplay.cc
 msgid "Unclassified"
 msgstr "Uklassifisert"
 
-#: dselect/pkgdisplay.cc:70
+#: dselect/pkgdisplay.cc
 msgid "suggests"
 msgstr "føreslår"
 
-#: dselect/pkgdisplay.cc:71
+#: dselect/pkgdisplay.cc
 msgid "recommends"
 msgstr "tilrår"
 
-#: dselect/pkgdisplay.cc:72
+#: dselect/pkgdisplay.cc
 msgid "depends on"
 msgstr "krev"
 
-#: dselect/pkgdisplay.cc:73
+#: dselect/pkgdisplay.cc
 msgid "pre-depends on"
 msgstr "forkrav"
 
-#: dselect/pkgdisplay.cc:74
+#: dselect/pkgdisplay.cc
 msgid "breaks"
 msgstr ""
 
-#: dselect/pkgdisplay.cc:75
+#: dselect/pkgdisplay.cc
 msgid "conflicts with"
 msgstr "konflikt med"
 
-#: dselect/pkgdisplay.cc:76
+#: dselect/pkgdisplay.cc
 msgid "provides"
 msgstr "gjev"
 
-#: dselect/pkgdisplay.cc:77
+#: dselect/pkgdisplay.cc
 msgid "replaces"
 msgstr "erstattar"
 
-#: dselect/pkgdisplay.cc:78
+#: dselect/pkgdisplay.cc
 msgid "enhances"
 msgstr "forbetrar"
 
-#: dselect/pkgdisplay.cc:81
+#: dselect/pkgdisplay.cc
 msgid "Req"
 msgstr "Krv"
 
-#: dselect/pkgdisplay.cc:82
+#: dselect/pkgdisplay.cc
 msgid "Imp"
 msgstr "Vkt"
 
-#: dselect/pkgdisplay.cc:83
+#: dselect/pkgdisplay.cc
 msgid "Std"
 msgstr "Std"
 
-#: dselect/pkgdisplay.cc:84
+#: dselect/pkgdisplay.cc
 msgid "Opt"
 msgstr "Val"
 
-#: dselect/pkgdisplay.cc:85
+#: dselect/pkgdisplay.cc
 msgid "Xtr"
 msgstr "Eks"
 
-#: dselect/pkgdisplay.cc:86
+#: dselect/pkgdisplay.cc
 msgid "bUG"
 msgstr "LUS"
 
-#: dselect/pkgdisplay.cc:87
+#: dselect/pkgdisplay.cc
 msgid "?"
 msgstr "?"
 
-#: dselect/pkgdisplay.cc:95 dselect/pkgdisplay.cc:115
+#: dselect/pkgdisplay.cc
 msgid "Broken"
 msgstr "Øydelagde"
 
-#: dselect/pkgdisplay.cc:96
+#: dselect/pkgdisplay.cc
 msgid "New"
 msgstr "Nye"
 
-#: dselect/pkgdisplay.cc:97
-msgid "Updated"
-msgstr "Oppdaterte"
+#: dselect/pkgdisplay.cc
+msgid "Upgradable"
+msgstr ""
 
-#: dselect/pkgdisplay.cc:98
+#: dselect/pkgdisplay.cc
 msgid "Obsolete/local"
 msgstr "Forelda/lokale"
 
-#: dselect/pkgdisplay.cc:99
-msgid "Up-to-date"
-msgstr "Ferdig oppdaterte"
+#: dselect/pkgdisplay.cc
+msgid "Installed"
+msgstr "Installerte"
 
-#: dselect/pkgdisplay.cc:100
+#: dselect/pkgdisplay.cc
 msgid "Available"
 msgstr "Tilgjengelege"
 
-#: dselect/pkgdisplay.cc:101 dselect/pkgdisplay.cc:117
+#: dselect/pkgdisplay.cc
 msgid "Removed"
 msgstr "Fjerna"
 
-#: dselect/pkgdisplay.cc:102 dselect/pkgdisplay.cc:111
+#: dselect/pkgdisplay.cc
 msgid "Brokenly installed packages"
 msgstr "Øydelagde installerte pakkar"
 
-#: dselect/pkgdisplay.cc:103
+#: dselect/pkgdisplay.cc
 msgid "Newly available packages"
 msgstr "Nye tilgjengelege pakkar"
 
-#: dselect/pkgdisplay.cc:104
-msgid "Updated packages (newer version is available)"
-msgstr "Oppdaterte pakkar (nyare versjon tilgjengeleg)"
+#: dselect/pkgdisplay.cc
+#, fuzzy
+#| msgid "Newly available packages"
+msgid "Upgradable packages"
+msgstr "Nye tilgjengelege pakkar"
 
-#: dselect/pkgdisplay.cc:105
-msgid "Obsolete and local packages present on system"
+#: dselect/pkgdisplay.cc
+#, fuzzy
+#| msgid "Obsolete and local packages present on system"
+msgid "Obsolete and locally created packages"
 msgstr "Forelda og lokale pakkar på systemet"
 
-#: dselect/pkgdisplay.cc:106
-msgid "Up to date installed packages"
-msgstr "Pakkar som er installerte i nyaste versjon"
+#: dselect/pkgdisplay.cc
+msgid "Installed packages"
+msgstr "Installerte pakkar"
 
-#: dselect/pkgdisplay.cc:107
-msgid "Available packages (not currently installed)"
-msgstr "Tilgjengelege pakkar (ikkje installerte)"
+#: dselect/pkgdisplay.cc
+#, fuzzy
+#| msgid "Up to date installed packages"
+msgid "Available not installed packages"
+msgstr "Pakkar som er installerte i nyaste versjon"
 
-#: dselect/pkgdisplay.cc:108
+#: dselect/pkgdisplay.cc
 msgid "Removed and no longer available packages"
 msgstr "Fjerna pakkar som ikkje lenger er tilgjengelege"
 
-#: dselect/pkgdisplay.cc:112
-msgid "Installed packages"
-msgstr "Installerte pakkar"
-
-#: dselect/pkgdisplay.cc:113
+#: dselect/pkgdisplay.cc
 msgid "Removed packages (configuration still present)"
 msgstr "Fjerna pakkar (teke vare på oppsettet)"
 
-#: dselect/pkgdisplay.cc:114
+#: dselect/pkgdisplay.cc
 msgid "Purged packages and those never installed"
 msgstr "Pakkar som er utreinska eller aldri installerte"
 
-#: dselect/pkgdisplay.cc:116
-msgid "Installed"
-msgstr "Installerte"
-
-#: dselect/pkgdisplay.cc:118
+#: dselect/pkgdisplay.cc
 msgid "Purged"
 msgstr "Reinska"
 
-#: dselect/pkgdisplay.cc:138
+#: dselect/pkgdisplay.cc
 msgid "Error"
 msgstr "Feil"
 
-#: dselect/pkgdisplay.cc:139
+#: dselect/pkgdisplay.cc
 msgid "Installed?"
 msgstr "Installert?"
 
-#: dselect/pkgdisplay.cc:140
+#: dselect/pkgdisplay.cc
 msgid "Old mark"
 msgstr "Gammalt merke"
 
-#: dselect/pkgdisplay.cc:141
+#: dselect/pkgdisplay.cc
 msgid "Marked for"
 msgstr "Markert for"
 
-#: dselect/pkgdisplay.cc:143
+#: dselect/pkgdisplay.cc
 msgid "EIOM"
 msgstr "FIGM"
 
-#: dselect/pkgdisplay.cc:147 dselect/pkgdisplay.cc:150
+#: dselect/pkgdisplay.cc
 msgid "Section"
 msgstr "Del"
 
-#: dselect/pkgdisplay.cc:148
+#: dselect/pkgdisplay.cc
 msgid "Priority"
 msgstr "Prioritet"
 
-#: dselect/pkgdisplay.cc:152
+#: dselect/pkgdisplay.cc
 msgid "Package"
 msgstr "Pakke"
 
-#: dselect/pkgdisplay.cc:161 dselect/pkgdisplay.cc:165
+#: dselect/pkgdisplay.cc
 #, fuzzy
 #| msgid "Avail.ver"
 msgid "Avail.arch"
 msgstr "Tilgj.ver"
 
-#: dselect/pkgdisplay.cc:164
+#: dselect/pkgdisplay.cc
 #, fuzzy
 #| msgid "Inst.ver"
 msgid "Inst.arch"
 msgstr "Inst.ver"
 
-#: dselect/pkgdisplay.cc:178 dselect/pkgdisplay.cc:182
+#: dselect/pkgdisplay.cc
 msgid "Avail.ver"
 msgstr "Tilgj.ver"
 
-#: dselect/pkgdisplay.cc:181
+#: dselect/pkgdisplay.cc
 msgid "Inst.ver"
 msgstr "Inst.ver"
 
-#: dselect/pkgdisplay.cc:197
+#: dselect/pkgdisplay.cc
 msgid "dselect - recursive package listing"
 msgstr "dselect - rekursiv pakkeliste"
 
-#: dselect/pkgdisplay.cc:199
+#: dselect/pkgdisplay.cc
 msgid "dselect - inspection of package states"
 msgstr "dselect - inspeksjon av pakkestatus"
 
-#: dselect/pkgdisplay.cc:200
+#: dselect/pkgdisplay.cc
 msgid "dselect - main package listing"
 msgstr "dselect - hovudpakkeliste"
 
-#: dselect/pkgdisplay.cc:208
+#: dselect/pkgdisplay.cc
 msgid " (by section)"
 msgstr " (etter del)"
 
-#: dselect/pkgdisplay.cc:211
+#: dselect/pkgdisplay.cc
 msgid " (avail., section)"
 msgstr " (tilgj., del)"
 
-#: dselect/pkgdisplay.cc:214
+#: dselect/pkgdisplay.cc
 msgid " (status, section)"
 msgstr " (status, del)"
 
-#: dselect/pkgdisplay.cc:223
+#: dselect/pkgdisplay.cc
 msgid " (by priority)"
 msgstr " (etter prioritet)"
 
-#: dselect/pkgdisplay.cc:226
+#: dselect/pkgdisplay.cc
 msgid " (avail., priority)"
 msgstr " (tilgj., prioritet)"
 
-#: dselect/pkgdisplay.cc:229
+#: dselect/pkgdisplay.cc
 msgid " (status, priority)"
 msgstr " (status, prioritet)"
 
-#: dselect/pkgdisplay.cc:238
+#: dselect/pkgdisplay.cc
 msgid " (alphabetically)"
 msgstr " (alfabetisk)"
 
-#: dselect/pkgdisplay.cc:241
+#: dselect/pkgdisplay.cc
 msgid " (by availability)"
 msgstr " (etter tilgjenge)"
 
-#: dselect/pkgdisplay.cc:244
+#: dselect/pkgdisplay.cc
 msgid " (by status)"
 msgstr " (etter status)"
 
-#: dselect/pkgdisplay.cc:259
+#: dselect/pkgdisplay.cc
 msgid " mark:+/=/- terse:v help:?"
 msgstr " marker:+/=/- stutt:v hjelp:?"
 
-#: dselect/pkgdisplay.cc:260
+#: dselect/pkgdisplay.cc
 msgid " mark:+/=/- verbose:v help:?"
 msgstr " marker:+/=/- fyldig:v hjelp:?"
 
-#: dselect/pkgdisplay.cc:262
+#: dselect/pkgdisplay.cc
 msgid " terse:v help:?"
 msgstr " stutt:v hjelp:?"
 
-#: dselect/pkgdisplay.cc:263
+#: dselect/pkgdisplay.cc
 msgid " verbose:v help:?"
 msgstr " fyldig:v hjelp:?"
 
-#: dselect/pkginfo.cc:85
+#: dselect/pkginfo.cc
 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 "
@@ -1575,86 +1586,118 @@ msgstr ""
 "Du kan endra sorteringsrekkjefølgja med «o» og «O» for sjølv å kunna markera "
 "pakkar i andre grupper."
 
-#: dselect/pkginfo.cc:98
+#: dselect/pkginfo.cc
 #, fuzzy
 msgid "Interrelationships"
 msgstr "samanhengar"
 
-#: dselect/pkginfo.cc:117
+#: dselect/pkginfo.cc
 #, fuzzy
 msgid "No description available."
 msgstr "inga skildring tilgjengeleg."
 
-#: dselect/pkginfo.cc:135
+#: dselect/pkginfo.cc
 #, fuzzy
 msgid "Installed control file information"
 msgstr "installert kontrollinformasjon for "
 
-#: dselect/pkginfo.cc:151
+#: dselect/pkginfo.cc
 #, fuzzy
 msgid "Available control file information"
 msgstr "tilgjengeleg versjon av kontrollfilinformasjon"
 
-#: dselect/pkglist.cc:425
+#: dselect/pkglist.cc
 #, fuzzy
 #| msgid "Installed packages"
 msgid "there are no packages"
 msgstr "Installerte pakkar"
 
-#: dselect/pkglist.cc:521
+#: dselect/pkglist.cc
 msgid "invalid search option given"
 msgstr "ugyldig søkjeval oppgjeve"
 
-#: dselect/pkglist.cc:536
+#: dselect/pkglist.cc
 msgid "error in regular expression"
 msgstr "feil i regulært uttrykk"
 
-#: dselect/pkgsublist.cc:111
+#: dselect/pkgsublist.cc
 msgid " does not appear to be available\n"
 msgstr " ser ikkje ut til å vera tilgjengeleg\n"
 
-#: dselect/pkgsublist.cc:131
+#: dselect/pkgsublist.cc
 msgid " or "
 msgstr " eller "
 
-#: dselect/pkgtop.cc:58
+#: dselect/pkgtop.cc
 msgid "All"
 msgstr "Alle"
 
-#: dselect/pkgtop.cc:80
+#: dselect/pkgtop.cc
 msgid "All packages"
 msgstr "Alle pakkar"
 
-#: dselect/pkgtop.cc:84
+#: dselect/pkgtop.cc
 #, c-format
 msgid "%s packages without a section"
 msgstr "%s pakkar utan nokon del"
 
-#: dselect/pkgtop.cc:86
+#: dselect/pkgtop.cc
 #, c-format
 msgid "%s packages in section %s"
 msgstr "%s pakkar i delen %s"
 
-#: dselect/pkgtop.cc:92
+#: dselect/pkgtop.cc
 #, c-format
 msgid "%s %s packages"
 msgstr "%s %s pakkar"
 
-#: dselect/pkgtop.cc:96
+#: dselect/pkgtop.cc
 #, c-format
 msgid "%s %s packages without a section"
 msgstr "%s %s pakkar utan nokon del"
 
-#: dselect/pkgtop.cc:98
+#: dselect/pkgtop.cc
 #, c-format
 msgid "%s %s packages in section %s"
 msgstr "%s %s pakkar i delen %s"
 
-#: dselect/pkgtop.cc:119
+#: dselect/pkgtop.cc
 #, c-format
 msgid "%-*s %s%s%s;  %s (was: %s).  %s"
 msgstr "%-*s %s%s%s;  %s (var: %s).  %s"
 
+#, fuzzy
+#~| msgid "Section"
+#~ msgid "Actions:\n"
+#~ msgstr "Del"
+
+#~ msgid "Colours:\n"
+#~ msgstr "Fargar:\n"
+
+#~ msgid "Attributes:\n"
+#~ msgstr "Attributtar:\n"
+
+#~ msgid "EOF before option name start"
+#~ msgstr "slutt-på-fil før starten på valnamnet"
+
+#~ msgid "EOF before summary"
+#~ msgstr "slutt-på-fil før skildringa"
+
+#~ msgid "!Bug!"
+#~ msgstr "!Lus!"
+
+#~ msgid "Updated"
+#~ msgstr "Oppdaterte"
+
+#~ msgid "Up-to-date"
+#~ msgstr "Ferdig oppdaterte"
+
+#~ msgid "Updated packages (newer version is available)"
+#~ msgstr "Oppdaterte pakkar (nyare versjon tilgjengeleg)"
+
+#~ msgid "Available packages (not currently installed)"
+#~ msgstr "Tilgjengelege pakkar (ikkje installerte)"
+
 #~ msgid "unable to open new option file `%.250s'"
 #~ msgstr "klarte ikkje opna den nye valfila «%.250s»"
 
diff --git a/dselect/po/pl.po b/dselect/po/pl.po
index 13cf5b6d2..cb4b41b92 100644
--- a/dselect/po/pl.po
+++ b/dselect/po/pl.po
@@ -13,7 +13,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dselect 1.15.4\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2014-12-23 18:12+0100\n"
+"POT-Creation-Date: 2015-04-06 09:37+0200\n"
 "PO-Revision-Date: 2014-12-21 20:58+0100\n"
 "Last-Translator: Łukasz Dulny <bartekchom@poczta.onet.pl>\n"
 "Language-Team: Polish <debian-l10n-polish@lists.debian.org>\n"
@@ -25,29 +25,29 @@ msgstr ""
 "|| n%100>=20) ? 1 : 2;\n"
 "X-Generator: Lokalize 1.5\n"
 
-#: dselect/basecmds.cc:125
+#: dselect/basecmds.cc
 msgid "Search for ? "
 msgstr "Szukaj ? "
 
-#: dselect/basecmds.cc:149
+#: dselect/basecmds.cc
 msgid "Error: "
 msgstr "Błąd: "
 
-#: dselect/basecmds.cc:180
+#: dselect/basecmds.cc
 msgid "Help: "
 msgstr "Pomoc: "
 
-#: dselect/basecmds.cc:186
+#: dselect/basecmds.cc
 msgid "Press ? for help menu, . for next topic, <space> to exit help."
 msgstr ""
 "Naciśnij ?, by skorzystać z pomocy, . (kropkę), by przejść do następnego\n"
 "tematu, <spację>, by opuścić pomoc."
 
-#: dselect/basecmds.cc:193
+#: dselect/basecmds.cc
 msgid "Help information is available under the following topics:"
 msgstr "Informacje pomocy są dostępne pod następującymi tematami:"
 
-#: dselect/basecmds.cc:201
+#: dselect/basecmds.cc
 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. "
@@ -55,239 +55,239 @@ msgstr ""
 "Wybierz klawisz z powyższej listy, <spację> lub \"q\", by opuścić \n"
 "pomoc, lub \".\" (kropkę), by przeglądać po kolei strony pomocy. "
 
-#: dselect/basecmds.cc:207
+#: dselect/basecmds.cc
 msgid "error reading keyboard in help"
 msgstr "błąd odczytu klawiatury w pomocy"
 
-#: dselect/baselist.cc:60
+#: dselect/baselist.cc
 msgid "ioctl(TIOCGWINSZ) failed"
 msgstr "nie powiodło się wywołanie ioctl(TIOCGWINSZ)"
 
-#: dselect/baselist.cc:63
+#: dselect/baselist.cc
 msgid "doupdate in SIGWINCH handler failed"
 msgstr "nie można uaktualnić procedury obsługi SIGWINCH"
 
-#: dselect/baselist.cc:72
+#: dselect/baselist.cc
 msgid "failed to restore old SIGWINCH sigact"
 msgstr "nie można odtworzyć poprzedniego sygnału SIGWINCH"
 
-#: dselect/baselist.cc:75
+#: dselect/baselist.cc
 msgid "failed to restore old signal mask"
 msgstr "nie można odtworzyć poprzedniej maski sygnału"
 
-#: dselect/baselist.cc:86
+#: dselect/baselist.cc
 msgid "failed to get old signal mask"
 msgstr "nie można pobrać poprzedniej maski sygnału"
 
-#: dselect/baselist.cc:88
+#: dselect/baselist.cc
 msgid "failed to get old SIGWINCH sigact"
 msgstr "nie można pobrać poprzedniego sygnału SIGWINCH"
 
-#: dselect/baselist.cc:93
+#: dselect/baselist.cc
 msgid "failed to block SIGWINCH"
 msgstr "nie można zablokować SIGWINCH"
 
-#: dselect/baselist.cc:99
+#: dselect/baselist.cc
 msgid "failed to set new SIGWINCH sigact"
 msgstr "nie można ustawić nowego sygnału SIGWINCH"
 
-#: dselect/baselist.cc:174
+#: dselect/baselist.cc
 msgid "failed to allocate colour pair"
 msgstr "nie można zarezerwować par koloru"
 
-#: dselect/baselist.cc:203
+#: dselect/baselist.cc
 msgid "failed to create title window"
 msgstr "nie można utworzyć okna tytułowego"
 
-#: dselect/baselist.cc:207
+#: dselect/baselist.cc
 msgid "failed to create whatinfo window"
 msgstr "nie można utworzyć okna informacyjnego"
 
-#: dselect/baselist.cc:211
+#: dselect/baselist.cc
 msgid "failed to create baselist pad"
 msgstr "nie można utworzyć pola listy"
 
-#: dselect/baselist.cc:214
+#: dselect/baselist.cc
 msgid "failed to create heading pad"
 msgstr "nie można utworzyć pola nagłówka"
 
-#: dselect/baselist.cc:218
+#: dselect/baselist.cc
 msgid "failed to create thisstate pad"
 msgstr "nie można utworzyć pola stanu"
 
-#: dselect/baselist.cc:222
+#: dselect/baselist.cc
 msgid "failed to create info pad"
 msgstr "nie można utworzyć pola informacyjnego"
 
-#: dselect/baselist.cc:227
+#: dselect/baselist.cc
 msgid "failed to create query window"
 msgstr "nie można utworzyć okna zapytania"
 
-#: dselect/baselist.cc:298
+#: dselect/baselist.cc
 msgid "Keybindings"
 msgstr "Skojarzenia klawiszy"
 
-#: dselect/baselist.cc:347
+#: dselect/baselist.cc
 #, c-format
 msgid "  -- %d%%, press "
 msgstr "  -- %d%%, wciśnij "
 
-#: dselect/baselist.cc:350
+#: dselect/baselist.cc
 #, c-format
 msgid "%s for more"
 msgstr "%s - więcej"
 
-#: dselect/baselist.cc:354
+#: dselect/baselist.cc
 #, c-format
 msgid "%s to go back"
 msgstr "%s - powrót"
 
-#: dselect/bindings.cc:78
+#: dselect/bindings.cc
 msgid "[not bound]"
 msgstr "[nie skojarzone]"
 
-#: dselect/bindings.cc:82
+#: dselect/bindings.cc
 #, c-format
 msgid "[unk: %d]"
 msgstr "[nieznane: %d]"
 
-#: dselect/bindings.cc:141
+#: dselect/bindings.cc
 msgid "Scroll onwards through help/information"
 msgstr "Przewinięcie pomocy/informacji w dół"
 
-#: dselect/bindings.cc:142
+#: dselect/bindings.cc
 msgid "Scroll backwards through help/information"
 msgstr "Przewinięcie pomocy/informacji w górę"
 
-#: dselect/bindings.cc:143
+#: dselect/bindings.cc
 msgid "Move up"
 msgstr "W górę"
 
-#: dselect/bindings.cc:144
+#: dselect/bindings.cc
 msgid "Move down"
 msgstr "W dół"
 
-#: dselect/bindings.cc:145
+#: dselect/bindings.cc
 msgid "Go to top of list"
 msgstr "Początek listy"
 
-#: dselect/bindings.cc:146
+#: dselect/bindings.cc
 msgid "Go to end of list"
 msgstr "Koniec listy"
 
-#: dselect/bindings.cc:147
+#: dselect/bindings.cc
 msgid "Request help (cycle through help screens)"
 msgstr "Wywołanie pomocy (przełączanie ekranów pomocy)"
 
-#: dselect/bindings.cc:148
+#: dselect/bindings.cc
 msgid "Cycle through information displays"
 msgstr "Przełączanie ekranów z informacjami"
 
-#: dselect/bindings.cc:149
+#: dselect/bindings.cc
 msgid "Redraw display"
 msgstr "Odświeżenie ekranu"
 
-#: dselect/bindings.cc:150
+#: dselect/bindings.cc
 msgid "Scroll onwards through list by 1 line"
 msgstr "Przewinięcie listy o jedną linię w dół"
 
-#: dselect/bindings.cc:151
+#: dselect/bindings.cc
 msgid "Scroll backwards through list by 1 line"
 msgstr "Przewinięcie listy o jedną linię w górę"
 
-#: dselect/bindings.cc:152
+#: dselect/bindings.cc
 msgid "Scroll onwards through help/information by 1 line"
 msgstr "Przewinięcie ekranu pomocy/informacji o jedną linię w dół"
 
-#: dselect/bindings.cc:153
+#: dselect/bindings.cc
 msgid "Scroll backwards through help/information by 1 line"
 msgstr "Przewinięcie ekranu pomocy/informacji o jedną linię w górę"
 
-#: dselect/bindings.cc:154
+#: dselect/bindings.cc
 msgid "Scroll onwards through list"
 msgstr "Przewinięcie listy w dół"
 
-#: dselect/bindings.cc:155
+#: dselect/bindings.cc
 msgid "Scroll backwards through list"
 msgstr "Przewinięcie listy w górę"
 
-#: dselect/bindings.cc:158
+#: dselect/bindings.cc
 msgid "Mark package(s) for installation"
 msgstr "Zaznaczenie pakietu do instalacji"
 
-#: dselect/bindings.cc:159
+#: dselect/bindings.cc
 msgid "Mark package(s) for deinstallation"
 msgstr "Zaznaczenie pakietu do usunięcia"
 
-#: dselect/bindings.cc:160
+#: dselect/bindings.cc
 msgid "Mark package(s) for deinstall and purge"
 msgstr "Zaznaczenie pakietu do wyczyszczenia"
 
-#: dselect/bindings.cc:161
+#: dselect/bindings.cc
 msgid "Make highlight more specific"
 msgstr "Włączenie szczegółowych informacji"
 
-#: dselect/bindings.cc:162
+#: dselect/bindings.cc
 msgid "Make highlight less specific"
 msgstr "Wyłączenie szczegółowych informacji"
 
-#: dselect/bindings.cc:163
+#: dselect/bindings.cc
 msgid "Search for a package whose name contains a string"
 msgstr "Wyszukiwanie pakietu o nazwie zawierającej ciąg znaków"
 
-#: dselect/bindings.cc:164
+#: dselect/bindings.cc
 msgid "Repeat last search"
 msgstr "Powtórzenie ostatniego wyszukiwania"
 
-#: dselect/bindings.cc:165
+#: dselect/bindings.cc
 msgid "Swap sort order priority/section"
 msgstr "Zmiana sposobu uporządkowania pakietów"
 
-#: dselect/bindings.cc:166
+#: dselect/bindings.cc
 msgid "Quit, confirming, and checking dependencies"
 msgstr "Wyjście z potwierdzeniem i sprawdzeniem zależności"
 
-#: dselect/bindings.cc:167
+#: dselect/bindings.cc
 msgid "Quit, confirming without check"
 msgstr "Wyjście z potwiedzeniem bez sprawdzenia"
 
-#: dselect/bindings.cc:168
+#: dselect/bindings.cc
 msgid "Quit, rejecting conflict/dependency suggestions"
 msgstr "Wyjście z odrzuceniem konfliktów/sugestii"
 
-#: dselect/bindings.cc:169
+#: dselect/bindings.cc
 msgid "Abort - quit without making changes"
 msgstr "Wycofanie się bez dokonania zmian"
 
-#: dselect/bindings.cc:170
+#: dselect/bindings.cc
 msgid "Revert to old state for all packages"
 msgstr "Przywrócenie poprzedniego stanu pakietów"
 
-#: dselect/bindings.cc:171
+#: dselect/bindings.cc
 msgid "Revert to suggested state for all packages"
 msgstr "Przywrócenie sugerowanego stanu pakietów"
 
-#: dselect/bindings.cc:172
+#: dselect/bindings.cc
 msgid "Revert to directly requested state for all packages"
 msgstr "Przywrócenie żądanego stanu pakietów"
 
-#: dselect/bindings.cc:173
+#: dselect/bindings.cc
 msgid "Revert to currently installed state for all packages"
 msgstr "Przywrócenie obecnie zainstalowanego stanu wszystkich pakietów"
 
-#: dselect/bindings.cc:176
+#: dselect/bindings.cc
 msgid "Select currently-highlighted access method"
 msgstr "Wybór metody dostępu"
 
-#: dselect/bindings.cc:177
+#: dselect/bindings.cc
 msgid "Quit without changing selected access method"
 msgstr "Wyjście bez zmiany metody dostępu"
 
-#: dselect/helpmsgs.cc:29
+#: dselect/helpmsgs.cc
 msgid "Keystrokes"
 msgstr "Spis klawiszy"
 
-#: dselect/helpmsgs.cc:29
+#: dselect/helpmsgs.cc
 msgid ""
 "Motion keys: Next/Previous, Top/End, Up/Down, Backwards/Forwards:\n"
 "  j, Down-arrow         k, Up-arrow             move highlight\n"
@@ -346,11 +346,11 @@ msgstr ""
 "   D     Wybierz niezbędne pakiety             n, \\   powtórz ostatnie "
 "szukanie\n"
 
-#: dselect/helpmsgs.cc:55
+#: dselect/helpmsgs.cc
 msgid "Introduction to package selections"
 msgstr "Wprowadzenie do wyboru pakietów"
 
-#: dselect/helpmsgs.cc:55
+#: dselect/helpmsgs.cc
 msgid ""
 "Welcome to dselect's main package listing.\n"
 "\n"
@@ -408,11 +408,11 @@ msgstr ""
 "Proszę wcisnąć <spację>, aby opuścić ekran pomocy i przejść do listy "
 "pakietów.\n"
 
-#: dselect/helpmsgs.cc:80
+#: dselect/helpmsgs.cc
 msgid "Introduction to read-only package list browser"
 msgstr "Wprowadzenie do przeglądarki listy pakietów (tylko do odczytu)"
 
-#: dselect/helpmsgs.cc:80
+#: dselect/helpmsgs.cc
 msgid ""
 "Welcome to dselect's main package listing.\n"
 "\n"
@@ -449,11 +449,11 @@ msgstr ""
 "Proszę wcisnać <spację>, aby opuścić ekran pomocy i przejść do listy "
 "pakietów.\n"
 
-#: dselect/helpmsgs.cc:99
+#: dselect/helpmsgs.cc
 msgid "Introduction to conflict/dependency resolution sub-list"
 msgstr "Wprowadzenie do listy konfliktów/zależności"
 
-#: dselect/helpmsgs.cc:99
+#: dselect/helpmsgs.cc
 msgid ""
 "Dependency/conflict resolution - introduction.\n"
 "\n"
@@ -515,11 +515,11 @@ msgstr ""
 "Proszę wcisnąć <spację>, aby opuścić ekran pomocy i przejść do listy "
 "pakietów; proszę pamiętać, że \"?\" przywołuje ponownie ten ekran.\n"
 
-#: dselect/helpmsgs.cc:125
+#: dselect/helpmsgs.cc
 msgid "Display, part 1: package listing and status chars"
 msgstr "Wybór pakietów, część 1: lista pakietów i oznaczenie stanu"
 
-#: dselect/helpmsgs.cc:125
+#: dselect/helpmsgs.cc
 msgid ""
 "The top half of the screen shows a list of packages.  For each package you "
 "see\n"
@@ -584,11 +584,11 @@ msgstr ""
 "wersji zainstalowanej i dostępnej (shift-V ukrywa/pokazuje) oraz krótki "
 "opis.\n"
 
-#: dselect/helpmsgs.cc:152
+#: dselect/helpmsgs.cc
 msgid "Display, part 2: list highlight; information display"
 msgstr "Wybór pakietów, część 2: kursor; wyświetlane informacje"
 
-#: dselect/helpmsgs.cc:152
+#: dselect/helpmsgs.cc
 msgid ""
 "* Highlight: One line in the package list will be highlighted.  It "
 "indicates\n"
@@ -639,11 +639,11 @@ msgstr ""
 "\"I\"\n"
 "  można ukryć to okno lub je rozszerzyć na większą część ekranu.\n"
 
-#: dselect/helpmsgs.cc:176
+#: dselect/helpmsgs.cc
 msgid "Introduction to method selection display"
 msgstr "Wprowadzenie do wyboru metody instalacji"
 
-#: dselect/helpmsgs.cc:176
+#: dselect/helpmsgs.cc
 msgid ""
 "dselect and dpkg can do automatic installation, loading the package files to "
 "be\n"
@@ -685,11 +685,11 @@ msgstr ""
 "menu\n"
 "pomocy dostępnego później pod klawiszem \"?\".\n"
 
-#: dselect/helpmsgs.cc:196
+#: dselect/helpmsgs.cc
 msgid "Keystrokes for method selection"
 msgstr "Spis klawiszy dla wyboru metody instalacji"
 
-#: dselect/helpmsgs.cc:196
+#: dselect/helpmsgs.cc
 msgid ""
 "Motion keys: Next/Previous, Top/End, Up/Down, Backwards/Forwards:\n"
 "  j, Down-arrow         k, Up-arrow             move highlight\n"
@@ -739,104 +739,104 @@ msgstr ""
 "  /                wyszukiwanie (return - anulowanie)\n"
 "  \\                powtórzenie ostatniego wyszukiwania\n"
 
-#: dselect/main.cc:63
+#: dselect/main.cc
 msgid "Type dselect --help for help."
 msgstr "Wpisz dselect --help aby otrzymać pomoc."
 
-#: dselect/main.cc:145
+#: dselect/main.cc
 msgid "a"
 msgstr "a"
 
-#: dselect/main.cc:145
+#: dselect/main.cc
 msgid "[A]ccess"
 msgstr "[A] Dostęp"
 
-#: dselect/main.cc:145
+#: dselect/main.cc
 msgid "Choose the access method to use."
 msgstr "Wybór metody dostępu."
 
-#: dselect/main.cc:146
+#: dselect/main.cc
 msgid "u"
 msgstr "u"
 
-#: dselect/main.cc:146
+#: dselect/main.cc
 msgid "[U]pdate"
 msgstr "[U] Aktualizacja"
 
-#: dselect/main.cc:146
+#: dselect/main.cc
 msgid "Update list of available packages, if possible."
 msgstr "Zaktualizowanie informacji o dostępnych pakietach."
 
-#: dselect/main.cc:147
+#: dselect/main.cc
 msgid "s"
 msgstr "s"
 
-#: dselect/main.cc:147
+#: dselect/main.cc
 msgid "[S]elect"
 msgstr "[S] Wybór"
 
-#: dselect/main.cc:147
+#: dselect/main.cc
 msgid "Request which packages you want on your system."
 msgstr "Wybór pakietów instalowanych w systemie."
 
-#: dselect/main.cc:148
+#: dselect/main.cc
 msgid "i"
 msgstr "i"
 
-#: dselect/main.cc:148
+#: dselect/main.cc
 msgid "[I]nstall"
 msgstr "[I] Instalacja"
 
-#: dselect/main.cc:148
+#: dselect/main.cc
 msgid "Install and upgrade wanted packages."
 msgstr "Instalacja i uaktualnienie wybranych pakietów."
 
-#: dselect/main.cc:149
+#: dselect/main.cc
 msgid "c"
 msgstr "c"
 
-#: dselect/main.cc:149
+#: dselect/main.cc
 msgid "[C]onfig"
 msgstr "[C] Konfiguracja"
 
-#: dselect/main.cc:149
+#: dselect/main.cc
 msgid "Configure any packages that are unconfigured."
 msgstr "Konfiguracja pakietów, które pozostały nieskonfigurowane."
 
-#: dselect/main.cc:150
+#: dselect/main.cc
 msgid "r"
 msgstr "r"
 
-#: dselect/main.cc:150
+#: dselect/main.cc
 msgid "[R]emove"
 msgstr "[R] Usuwanie"
 
-#: dselect/main.cc:150
+#: dselect/main.cc
 msgid "Remove unwanted software."
 msgstr "Usuwanie niechcianych pakietów."
 
-#: dselect/main.cc:151
+#: dselect/main.cc
 msgid "q"
 msgstr "q"
 
-#: dselect/main.cc:151
+#: dselect/main.cc
 msgid "[Q]uit"
 msgstr "[Q] Wyjście"
 
-#: dselect/main.cc:151
+#: dselect/main.cc
 msgid "Quit dselect."
 msgstr "Wyjście z dselect."
 
-#: dselect/main.cc:152
+#: dselect/main.cc
 msgid "menu"
 msgstr "menu"
 
-#: dselect/main.cc:157
+#: dselect/main.cc
 #, c-format
 msgid "Debian `%s' package handling frontend version %s.\n"
 msgstr "Debian \"%s\", nakładka na program zarządzania pakietami, wersja %s.\n"
 
-#: dselect/main.cc:160
+#: dselect/main.cc
 msgid ""
 "This is free software; see the GNU General Public License version 2 or\n"
 "later for copying conditions. There is NO warranty.\n"
@@ -845,29 +845,47 @@ msgstr ""
 "Powszechną Licencję Publiczną GNU w wersji drugiej lub późniejszej,\n"
 "by dowiedzieć się o warunkach rozpowszechniania. BRAK gwarancji.\n"
 
-#: dselect/main.cc:169 dselect/main.cc:217
+#: dselect/main.cc
 msgid "<standard output>"
 msgstr "<standardowe wyjście>"
 
-#: dselect/main.cc:180
-#, c-format
+#: dselect/main.cc
+#, fuzzy, c-format
+#| msgid ""
+#| "Usage: %s [<option> ...] [<action> ...]\n"
+#| "\n"
 msgid ""
-"Usage: %s [<option> ...] [<action> ...]\n"
+"Usage: %s [<option>...] [<command>...]\n"
 "\n"
 msgstr ""
 "Użycie: %s [<opcja> ...] [<akcja> ...]\n"
 "\n"
 
-#: dselect/main.cc:184
+#: dselect/main.cc
 #, c-format
+msgid "Commands:\n"
+msgstr ""
+
+#: dselect/main.cc
+#, fuzzy, c-format
+#| msgid ""
+#| "Options:\n"
+#| "  --admindir <directory>     Use <directory> instead of %s.\n"
+#| "  --expert                   Turn on expert mode.\n"
+#| "  --debug <file> | -D<file>  Turn on debugging, sending output to "
+#| "<file>.\n"
+#| "  --colour | --color screenpart:[foreground],[background][:attr[+attr"
+#| "+...]]\n"
+#| "                             Configure screen colours.\n"
+#| "\n"
 msgid ""
 "Options:\n"
-"  --admindir <directory>     Use <directory> instead of %s.\n"
-"  --expert                   Turn on expert mode.\n"
-"  --debug <file> | -D<file>  Turn on debugging, sending output to <file>.\n"
-"  --colour | --color screenpart:[foreground],[background][:attr[+attr+...]]\n"
-"                             Configure screen colours.\n"
-"\n"
+"      --admindir <directory>       Use <directory> instead of %s.\n"
+"      --expert                     Turn on expert mode.\n"
+"  -D, --debug <file>               Turn on debugging, send output to "
+"<file>.\n"
+"      --color <color-spec>         Configure screen colors.\n"
+"      --colour <color-spec>        Ditto.\n"
 msgstr ""
 "Opcje:\n"
 "  --admindir <katalog>       Używa <katalogu> zamiast %s.\n"
@@ -878,72 +896,79 @@ msgstr ""
 "                             Konfiguruje kolory ekranu.\n"
 "\n"
 
-#: dselect/main.cc:193
-#, c-format
+#: dselect/main.cc
+#, fuzzy, c-format
+#| msgid ""
+#| "  --help                     Show this help message.\n"
+#| "  --version                  Show the version.\n"
+#| "\n"
 msgid ""
-"  --help                     Show this help message.\n"
-"  --version                  Show the version.\n"
+"  -?, --help                       Show this help message.\n"
+"      --version                    Show the version.\n"
 "\n"
 msgstr ""
 "  --help                     Wyświetla ten komunikat pomocy.\n"
 "  --version                  Wyświetla informacje o wersji.\n"
 "\n"
 
-#: dselect/main.cc:197
+#: dselect/main.cc
 #, c-format
-msgid "Actions:\n"
-msgstr "Działania:\n"
+msgid ""
+"<color-spec> is <screen-part>:[<foreground>],[<background>][:"
+"<attr>[+<attr>]...]\n"
+msgstr ""
 
-#: dselect/main.cc:202
-#, c-format
-msgid "Screenparts:\n"
+#: dselect/main.cc
+#, fuzzy, c-format
+#| msgid "Screenparts:\n"
+msgid "<screen-part> is:"
 msgstr "Części widoku:\n"
 
-#: dselect/main.cc:207
+#: dselect/main.cc
 #, c-format
-msgid "Colours:\n"
-msgstr "Kolory:\n"
+msgid "<color> is:"
+msgstr ""
 
-#: dselect/main.cc:212
+#: dselect/main.cc
 #, c-format
-msgid "Attributes:\n"
-msgstr "Atrybuty:\n"
+msgid "<attr> is:"
+msgstr ""
 
-#: dselect/main.cc:232
+#: dselect/main.cc
 #, c-format
 msgid "couldn't open debug file `%.255s'\n"
 msgstr "nie można otworzyć pliku debuggera \"%.255s\"\n"
 
-#: dselect/main.cc:253
+#: dselect/main.cc
 #, c-format
 msgid "invalid %s '%s'"
 msgstr "nieprawidłowe %s \"%s\""
 
-#: dselect/main.cc:272
+#: dselect/main.cc
 msgid "screen part"
 msgstr "część widoku"
 
-#: dselect/main.cc:278
+#: dselect/main.cc
 msgid "null colour specification"
 msgstr "pusta specyfikacja koloru"
 
-#: dselect/main.cc:286 dselect/main.cc:291
+#: dselect/main.cc
 msgid "colour"
 msgstr "kolor"
 
-#: dselect/main.cc:299
+#: dselect/main.cc
 msgid "colour attribute"
 msgstr "atrybuty koloru"
 
-#: dselect/main.cc:333
+#: dselect/main.cc
 msgid "Terminal does not appear to support cursor addressing.\n"
 msgstr "Terminal nie obsługuje adresowania kursora.\n"
 
-#: dselect/main.cc:335
+#: dselect/main.cc
 msgid "Terminal does not appear to support highlighting.\n"
 msgstr "Terminal nie obsługuje podświetlania.\n"
 
-#: dselect/main.cc:337
+#: dselect/main.cc
 #, c-format
 msgid ""
 "Set your TERM variable correctly, use a better terminal,\n"
@@ -952,11 +977,11 @@ msgstr ""
 "Proszę poprawnie ustawić zmienną TERM, użyć lepszego terminala,\n"
 "lub wykorzystać narzędzie do zarządzania pakietami %s.\n"
 
-#: dselect/main.cc:340
+#: dselect/main.cc
 msgid "terminal lacks necessary features, giving up"
 msgstr "brak potrzebnych funkcji terminala, przerywanie"
 
-#: dselect/main.cc:425
+#: dselect/main.cc
 msgid ""
 "\n"
 "\n"
@@ -970,7 +995,7 @@ msgstr ""
 "Wciśnij <enter> aby potwierdzić wybór.  ^L - odświeżenie ekranu.\n"
 "\n"
 
-#: dselect/main.cc:430
+#: dselect/main.cc
 msgid ""
 "Copyright (C) 1994-1996 Ian Jackson.\n"
 "Copyright (C) 2000,2001 Wichert Akkerman.\n"
@@ -978,7 +1003,7 @@ msgstr ""
 "Copyright (C) 1994-1996 Ian Jackson.\n"
 "Copyright (C) 2000,2001 Wichert Akkerman.\n"
 
-#: dselect/main.cc:436
+#: dselect/main.cc
 msgid ""
 "\n"
 "\n"
@@ -988,57 +1013,57 @@ msgstr ""
 "\n"
 "Tryb tylko do odczytu: można jedynie przeglądać listę pakietów!"
 
-#: dselect/main.cc:455
+#: dselect/main.cc
 msgid "failed to getch in main menu"
 msgstr "nie można wywołać \"getch\" w głównym menu"
 
-#: dselect/main.cc:538
+#: dselect/main.cc
 #, c-format
 msgid "unknown action string `%.50s'"
 msgstr "nieznane działanie \"%.50s\""
 
-#: dselect/methlist.cc:66
+#: dselect/methlist.cc
 msgid "Abbrev."
 msgstr "Oznaczenie"
 
-#: dselect/methlist.cc:67 dselect/pkgdisplay.cc:188 dselect/pkginfo.cc:110
+#: dselect/methlist.cc dselect/pkgdisplay.cc dselect/pkginfo.cc
 msgid "Description"
 msgstr "Opis"
 
-#: dselect/methlist.cc:73
+#: dselect/methlist.cc
 msgid "dselect - list of access methods"
 msgstr "dselect - lista metod dostępu"
 
-#: dselect/methlist.cc:82
+#: dselect/methlist.cc
 #, c-format
 msgid "Access method `%s'."
 msgstr "Metoda dostępu \"%s\"."
 
-#: dselect/methlist.cc:161 dselect/pkglist.cc:587
+#: dselect/methlist.cc dselect/pkglist.cc
 msgid "doupdate failed"
 msgstr "nie można wykonać funkcji \"doupdate\""
 
-#: dselect/methlist.cc:164 dselect/pkglist.cc:590
+#: dselect/methlist.cc dselect/pkglist.cc
 msgid "failed to unblock SIGWINCH"
 msgstr "nie można odblokować SIGWINCH"
 
-#: dselect/methlist.cc:169 dselect/pkglist.cc:595
+#: dselect/methlist.cc dselect/pkglist.cc
 msgid "failed to re-block SIGWINCH"
 msgstr "nie można ponownie zablokować SIGWINCH"
 
-#: dselect/methlist.cc:170 dselect/pkglist.cc:597
+#: dselect/methlist.cc dselect/pkglist.cc
 msgid "getch failed"
 msgstr "nie można wykonać funkcji \"getch\""
 
-#: dselect/methlist.cc:187
+#: dselect/methlist.cc
 msgid "Explanation"
 msgstr "Wyjaśnienie"
 
-#: dselect/methlist.cc:197
+#: dselect/methlist.cc
 msgid "No explanation available."
 msgstr "Brak dostępnego wyjaśnienia."
 
-#: dselect/method.cc:67
+#: dselect/method.cc
 #, c-format
 msgid ""
 "\n"
@@ -1049,7 +1074,7 @@ msgstr ""
 "\n"
 "%s: %s\n"
 
-#: dselect/method.cc:70
+#: dselect/method.cc
 msgid ""
 "\n"
 "Press <enter> to continue."
@@ -1057,185 +1082,195 @@ msgstr ""
 "\n"
 "Wciśnij <enter>, aby kontynuować."
 
-#: dselect/method.cc:82
+#: dselect/method.cc
 msgid "cannot unlock access method area"
 msgstr "nie można odblokować obszaru metod dostępu"
 
-#: dselect/method.cc:96
+#: dselect/method.cc
 msgid "no access methods are available"
 msgstr "żadna metoda dostępu nie jest dostępna"
 
-#: dselect/method.cc:115
+#: dselect/method.cc
 msgid "requested operation requires superuser privilege"
 msgstr "żądana operacja wymaga przywilejów superużytkownika"
 
-#: dselect/method.cc:118
+#: dselect/method.cc
 msgid "cannot open or create access method lockfile"
 msgstr "nie można otworzyć lub utworzyć pliku blokady metody dostępu"
 
-#: dselect/method.cc:125
+#: dselect/method.cc
 msgid "the access method area is already locked"
 msgstr "obszar metod dostępu jest już zablokowany"
 
-#: dselect/method.cc:128
+#: dselect/method.cc
 msgid "cannot lock access method area"
 msgstr "nie można zablokować obszaru metod dostępu"
 
-#: dselect/method.cc:161
+#: dselect/method.cc
 #, c-format
 msgid "Press <enter> to continue.\n"
 msgstr "Wciśnij <enter>, aby kontynuować.\n"
 
-#: dselect/method.cc:162
+#: dselect/method.cc
 msgid "<standard error>"
 msgstr "<standardowe wyjście błędów>"
 
-#: dselect/method.cc:165
+#: dselect/method.cc
 msgid "error reading acknowledgement of program failure message"
 msgstr "nie można odczytać potwiedzenia komunikatów błędów programu"
 
-#: dselect/method.cc:187
+#: dselect/method.cc
 msgid "no access method is selected or configured"
 msgstr "żadna metoda dostępu nie jest wybrana ani skonfigurowana"
 
-#: dselect/method.cc:196
+#: dselect/method.cc
 msgid "update available list script"
 msgstr "aktualizacja listy dostępnych skryptów"
 
-#: dselect/method.cc:200
+#: dselect/method.cc
 msgid "installation script"
 msgstr "skrypt instalacyjny"
 
-#: dselect/method.cc:246
+#: dselect/method.cc
 msgid "query/setup script"
 msgstr "skrypt zapytania/ustawiania"
 
-#: dselect/methparse.cc:53
+#: dselect/methparse.cc
 #, c-format
 msgid "syntax error in method options file `%.250s' -- %s"
 msgstr "błąd składni w pliku opcji metody \"%.250s\" -- %s"
 
-#: dselect/methparse.cc:59
+#: dselect/methparse.cc
 #, c-format
 msgid "error reading options file `%.250s'"
 msgstr "nie można odczytać pliku opcji \"%.250s\""
 
-#: dselect/methparse.cc:93
+#: dselect/methparse.cc
 #, c-format
 msgid "unable to read `%.250s' directory for reading methods"
 msgstr "nie można odczytać katalogu \"%.250s\" do odczytu metod"
 
-#: dselect/methparse.cc:109
+#: dselect/methparse.cc
 #, c-format
 msgid "method `%.250s' has name that is too long (%d > %d characters)"
 msgstr "metoda \"%.250s\" ma za długą nazwę (%d > %d znaków)"
 
-#: dselect/methparse.cc:120
+#: dselect/methparse.cc
 #, c-format
 msgid "unable to access method script `%.250s'"
 msgstr "nie można odczytać skryptu opcji metody \"%.250s\""
 
-#: dselect/methparse.cc:126
+#: dselect/methparse.cc
 #, c-format
 msgid "unable to read method options file `%.250s'"
 msgstr "nie można odczytać pliku opcji metody \"%.250s\""
 
-#: dselect/methparse.cc:150
+#: dselect/methparse.cc
 msgid "non-digit where digit wanted"
 msgstr "znak nie będący cyfrą tam gdzie jest wymagana"
 
-#: dselect/methparse.cc:153
-msgid "EOF in index string"
+#: dselect/methparse.cc
+#, fuzzy
+#| msgid "EOF in index string"
+msgid "end of file in index string"
 msgstr "EOF w ciągu znaków indeksu"
 
-#: dselect/methparse.cc:156
+#: dselect/methparse.cc
 msgid "index string too long"
 msgstr "ciąg znaków indeksu jest za długi"
 
-#: dselect/methparse.cc:159
+#: dselect/methparse.cc
 msgid "newline before option name start"
 msgstr "znak nowej linii przed nazwą opcji"
 
-#: dselect/methparse.cc:161
-msgid "EOF before option name start"
-msgstr "EOF przed nazwą opcji"
+#: dselect/methparse.cc
+#, fuzzy
+#| msgid "newline before option name start"
+msgid "end of file before option name start"
+msgstr "znak nowej linii przed nazwą opcji"
 
-#: dselect/methparse.cc:165
+#: dselect/methparse.cc
 msgid "nonalpha where option name start wanted"
 msgstr "znak nie będący literą na początku nazwy opcji"
 
-#: dselect/methparse.cc:167
+#: dselect/methparse.cc
 msgid "non-alphanum in option name"
 msgstr "znak nie będący literą lub cyfrą w nazwie opcji"
 
-#: dselect/methparse.cc:170
-msgid "EOF in option name"
+#: dselect/methparse.cc
+#, fuzzy
+#| msgid "EOF in option name"
+msgid "end of file in option name"
 msgstr "EOF w nazwie opcji"
 
-#: dselect/methparse.cc:175
+#: dselect/methparse.cc
 msgid "newline before summary"
 msgstr "znak nowej linii przed podsumowaniem"
 
-#: dselect/methparse.cc:177
-msgid "EOF before summary"
-msgstr "EOF przed podsumowaniem"
+#: dselect/methparse.cc
+#, fuzzy
+#| msgid "newline before summary"
+msgid "end of file before summary"
+msgstr "znak nowej linii przed podsumowaniem"
 
-#: dselect/methparse.cc:183
-msgid "EOF in summary - missing newline"
+#: dselect/methparse.cc
+#, fuzzy
+#| msgid "EOF in summary - missing newline"
+msgid "end of file in summary - missing newline"
 msgstr "EOF w podsumowaniu - brak znaku nowej linii"
 
-#: dselect/methparse.cc:193
+#: dselect/methparse.cc
 #, c-format
 msgid "unable to open option description file `%.250s'"
 msgstr "nie można otworzyć pliku opisu opcji \"%.250s\""
 
-#: dselect/methparse.cc:197
+#: dselect/methparse.cc
 #, c-format
 msgid "unable to stat option description file `%.250s'"
 msgstr "nie można ustalić stanu pliku opisu opcji %.250s"
 
-#: dselect/methparse.cc:201
+#: dselect/methparse.cc
 #, c-format
 msgid "failed to read option description file `%.250s'"
 msgstr "nie można odczytać pliku opisu opcji %.250s"
 
-#: dselect/methparse.cc:204
+#: dselect/methparse.cc
 #, c-format
 msgid "error during read of option description file `%.250s'"
 msgstr "nie można odczytać pliku opisu opcji %.250s"
 
-#: dselect/methparse.cc:227
+#: dselect/methparse.cc
 #, c-format
 msgid "error during read of method options file `%.250s'"
 msgstr "nie można odczytać pliku opcji metody %.250s"
 
-#: dselect/methparse.cc:250
+#: dselect/methparse.cc
 #, c-format
 msgid "unable to open current option file `%.250s'"
 msgstr "nie można otworzyć pliku bieżącej opcji \"%.250s\""
 
-#: dselect/methparse.cc:286
+#: dselect/methparse.cc
 #, c-format
 msgid "unable to write new option to `%.250s'"
 msgstr "nie można zapisać nowej opcji w \"%.250s\""
 
-#: dselect/pkgdisplay.cc:36
+#: dselect/pkgdisplay.cc
 msgid "new package"
 msgstr "nowy pakiet"
 
-#: dselect/pkgdisplay.cc:37
+#: dselect/pkgdisplay.cc
 msgid "install"
 msgstr "instalacja"
 
-#: dselect/pkgdisplay.cc:38
+#: dselect/pkgdisplay.cc
 msgid "hold"
 msgstr "wstrzymany"
 
-#: dselect/pkgdisplay.cc:39
+#: dselect/pkgdisplay.cc
 msgid "remove"
 msgstr "usuwanie"
 
-#: dselect/pkgdisplay.cc:40
+#: dselect/pkgdisplay.cc
 msgid "purge"
 msgstr "wyczyszczony"
 
@@ -1243,327 +1278,321 @@ msgstr "wyczyszczony"
 #. * the empty string to store information about the translation. DO NOT
 #. * CHANGE THAT IN A TRANSLATION! The code really relies on that being
 #. * a single space.
-#: dselect/pkgdisplay.cc:47
+#: dselect/pkgdisplay.cc
 msgid " "
 msgstr " "
 
-#: dselect/pkgdisplay.cc:48
+#: dselect/pkgdisplay.cc
 msgid "REINSTALL"
 msgstr "REINSTALACJA"
 
-#: dselect/pkgdisplay.cc:51
+#: dselect/pkgdisplay.cc
 msgid "not installed"
 msgstr "nie zainstalowany"
 
-#: dselect/pkgdisplay.cc:52
+#: dselect/pkgdisplay.cc
 msgid "removed (configs remain)"
 msgstr "usunięty (zostały pliki konfiguracyjne)"
 
-#: dselect/pkgdisplay.cc:53
+#: dselect/pkgdisplay.cc
 msgid "half installed"
 msgstr "wpół zainstalowany"
 
-#: dselect/pkgdisplay.cc:54
+#: dselect/pkgdisplay.cc
 msgid "unpacked (not set up)"
 msgstr "rozpakowany (nieskonfigurowany)"
 
-#: dselect/pkgdisplay.cc:55
+#: dselect/pkgdisplay.cc
 msgid "half configured (config failed)"
 msgstr "częściowo skonfigurowane (zawiodło konfigurowanie)"
 
-#: dselect/pkgdisplay.cc:56
+#: dselect/pkgdisplay.cc
 msgid "awaiting trigger processing"
 msgstr "oczekiwanie na przetworzenie wyzwalaczy"
 
-#: dselect/pkgdisplay.cc:57
+#: dselect/pkgdisplay.cc
 msgid "triggered"
 msgstr "wyzwalacz pobudzony"
 
-#: dselect/pkgdisplay.cc:58
+#: dselect/pkgdisplay.cc
 msgid "installed"
 msgstr "zainstalowany"
 
-#: dselect/pkgdisplay.cc:61
+#: dselect/pkgdisplay.cc
 msgid "Required"
 msgstr "Wymagane"
 
-#: dselect/pkgdisplay.cc:62
+#: dselect/pkgdisplay.cc
 msgid "Important"
 msgstr "Ważne"
 
-#: dselect/pkgdisplay.cc:63
+#: dselect/pkgdisplay.cc
 msgid "Standard"
 msgstr "Zwyczajne"
 
-#: dselect/pkgdisplay.cc:64
+#: dselect/pkgdisplay.cc
 msgid "Optional"
 msgstr "Opcjonalne"
 
-#: dselect/pkgdisplay.cc:65
+#: dselect/pkgdisplay.cc
 msgid "Extra"
 msgstr "Dodatkowe"
 
-#: dselect/pkgdisplay.cc:66
-msgid "!Bug!"
-msgstr "!Błąd!"
-
-#: dselect/pkgdisplay.cc:67
+#: dselect/pkgdisplay.cc
 msgid "Unclassified"
 msgstr "Niesklasyfikowane"
 
-#: dselect/pkgdisplay.cc:70
+#: dselect/pkgdisplay.cc
 msgid "suggests"
 msgstr "sugeruje"
 
-#: dselect/pkgdisplay.cc:71
+#: dselect/pkgdisplay.cc
 msgid "recommends"
 msgstr "poleca"
 
-#: dselect/pkgdisplay.cc:72
+#: dselect/pkgdisplay.cc
 msgid "depends on"
 msgstr "wymaga"
 
-#: dselect/pkgdisplay.cc:73
+#: dselect/pkgdisplay.cc
 msgid "pre-depends on"
 msgstr "wymaga wstępnie"
 
-#: dselect/pkgdisplay.cc:74
+#: dselect/pkgdisplay.cc
 msgid "breaks"
 msgstr "uszkadza"
 
-#: dselect/pkgdisplay.cc:75
+#: dselect/pkgdisplay.cc
 msgid "conflicts with"
 msgstr "w konflikcie z"
 
-#: dselect/pkgdisplay.cc:76
+#: dselect/pkgdisplay.cc
 msgid "provides"
 msgstr "dostarcza"
 
-#: dselect/pkgdisplay.cc:77
+#: dselect/pkgdisplay.cc
 msgid "replaces"
 msgstr "wymienia"
 
-#: dselect/pkgdisplay.cc:78
+#: dselect/pkgdisplay.cc
 msgid "enhances"
 msgstr "rozszerza"
 
-#: dselect/pkgdisplay.cc:81
+#: dselect/pkgdisplay.cc
 msgid "Req"
 msgstr "Wym"
 
-#: dselect/pkgdisplay.cc:82
+#: dselect/pkgdisplay.cc
 msgid "Imp"
 msgstr "Waż"
 
-#: dselect/pkgdisplay.cc:83
+#: dselect/pkgdisplay.cc
 msgid "Std"
 msgstr "Zwy"
 
-#: dselect/pkgdisplay.cc:84
+#: dselect/pkgdisplay.cc
 msgid "Opt"
 msgstr "Opc"
 
-#: dselect/pkgdisplay.cc:85
+#: dselect/pkgdisplay.cc
 msgid "Xtr"
 msgstr "Dod"
 
-#: dselect/pkgdisplay.cc:86
+#: dselect/pkgdisplay.cc
 msgid "bUG"
 msgstr "Błą"
 
-#: dselect/pkgdisplay.cc:87
+#: dselect/pkgdisplay.cc
 msgid "?"
 msgstr "?"
 
-#: dselect/pkgdisplay.cc:95 dselect/pkgdisplay.cc:115
+#: dselect/pkgdisplay.cc
 msgid "Broken"
 msgstr "Uszkodzone"
 
-#: dselect/pkgdisplay.cc:96
+#: dselect/pkgdisplay.cc
 msgid "New"
 msgstr "Nowe"
 
-#: dselect/pkgdisplay.cc:97
-msgid "Updated"
-msgstr "Do aktualizacji"
+#: dselect/pkgdisplay.cc
+msgid "Upgradable"
+msgstr ""
 
-#: dselect/pkgdisplay.cc:98
+#: dselect/pkgdisplay.cc
 msgid "Obsolete/local"
 msgstr "Wycofane/lokalne"
 
-#: dselect/pkgdisplay.cc:99
-msgid "Up-to-date"
-msgstr "Aktualne"
+#: dselect/pkgdisplay.cc
+msgid "Installed"
+msgstr "Zainstalowane"
 
-#: dselect/pkgdisplay.cc:100
+#: dselect/pkgdisplay.cc
 msgid "Available"
 msgstr "Dostępne"
 
-#: dselect/pkgdisplay.cc:101 dselect/pkgdisplay.cc:117
+#: dselect/pkgdisplay.cc
 msgid "Removed"
 msgstr "Usunięte"
 
-#: dselect/pkgdisplay.cc:102 dselect/pkgdisplay.cc:111
+#: dselect/pkgdisplay.cc
 msgid "Brokenly installed packages"
 msgstr "Pakiety uszkodzone podczas instalacji"
 
-#: dselect/pkgdisplay.cc:103
+#: dselect/pkgdisplay.cc
 msgid "Newly available packages"
 msgstr "Pakiety nowo dostępne"
 
-#: dselect/pkgdisplay.cc:104
-msgid "Updated packages (newer version is available)"
-msgstr "Pakiety do aktualizacji (dostępna nowsza wersja)"
+#: dselect/pkgdisplay.cc
+#, fuzzy
+#| msgid "Newly available packages"
+msgid "Upgradable packages"
+msgstr "Pakiety nowo dostępne"
 
-#: dselect/pkgdisplay.cc:105
-msgid "Obsolete and local packages present on system"
+#: dselect/pkgdisplay.cc
+#, fuzzy
+#| msgid "Obsolete and local packages present on system"
+msgid "Obsolete and locally created packages"
 msgstr "Pakiety wycofane lub dostępne tylko lokalnie"
 
-#: dselect/pkgdisplay.cc:106
-msgid "Up to date installed packages"
-msgstr "Pakiety aktualne"
+#: dselect/pkgdisplay.cc
+msgid "Installed packages"
+msgstr "Pakiety zainstalowane"
 
-#: dselect/pkgdisplay.cc:107
-msgid "Available packages (not currently installed)"
-msgstr "Pakiety dostępne (jeszcze nie zainstalowane)"
+#: dselect/pkgdisplay.cc
+#, fuzzy
+#| msgid "Up to date installed packages"
+msgid "Available not installed packages"
+msgstr "Pakiety aktualne"
 
-#: dselect/pkgdisplay.cc:108
+#: dselect/pkgdisplay.cc
 msgid "Removed and no longer available packages"
 msgstr "Pakiety usunięte i już niedostępne"
 
-#: dselect/pkgdisplay.cc:112
-msgid "Installed packages"
-msgstr "Pakiety zainstalowane"
-
-#: dselect/pkgdisplay.cc:113
+#: dselect/pkgdisplay.cc
 msgid "Removed packages (configuration still present)"
 msgstr "Pakiety usunięte (pozostały pliki konfiguracyjne)"
 
-#: dselect/pkgdisplay.cc:114
+#: dselect/pkgdisplay.cc
 msgid "Purged packages and those never installed"
 msgstr "Pakiety wyczyszczone i nie zainstalowane"
 
-#: dselect/pkgdisplay.cc:116
-msgid "Installed"
-msgstr "Zainstalowane"
-
-#: dselect/pkgdisplay.cc:118
+#: dselect/pkgdisplay.cc
 msgid "Purged"
 msgstr "Wyczyszczone"
 
-#: dselect/pkgdisplay.cc:138
+#: dselect/pkgdisplay.cc
 msgid "Error"
 msgstr "Błąd"
 
-#: dselect/pkgdisplay.cc:139
+#: dselect/pkgdisplay.cc
 msgid "Installed?"
 msgstr "zainstalowany?"
 
-#: dselect/pkgdisplay.cc:140
+#: dselect/pkgdisplay.cc
 msgid "Old mark"
 msgstr "Poprzedni wybór"
 
-#: dselect/pkgdisplay.cc:141
+#: dselect/pkgdisplay.cc
 msgid "Marked for"
 msgstr "Zaznaczony do"
 
-#: dselect/pkgdisplay.cc:143
+#: dselect/pkgdisplay.cc
 msgid "EIOM"
 msgstr "EIOM"
 
-#: dselect/pkgdisplay.cc:147 dselect/pkgdisplay.cc:150
+#: dselect/pkgdisplay.cc
 msgid "Section"
 msgstr "Sekcja"
 
-#: dselect/pkgdisplay.cc:148
+#: dselect/pkgdisplay.cc
 msgid "Priority"
 msgstr "Priorytet"
 
-#: dselect/pkgdisplay.cc:152
+#: dselect/pkgdisplay.cc
 msgid "Package"
 msgstr "Pakiet"
 
-#: dselect/pkgdisplay.cc:161 dselect/pkgdisplay.cc:165
+#: dselect/pkgdisplay.cc
 msgid "Avail.arch"
 msgstr "Dostęp.arch"
 
-#: dselect/pkgdisplay.cc:164
+#: dselect/pkgdisplay.cc
 msgid "Inst.arch"
 msgstr "Zainst.arch"
 
-#: dselect/pkgdisplay.cc:178 dselect/pkgdisplay.cc:182
+#: dselect/pkgdisplay.cc
 msgid "Avail.ver"
 msgstr "Dostęp.wer"
 
-#: dselect/pkgdisplay.cc:181
+#: dselect/pkgdisplay.cc
 msgid "Inst.ver"
 msgstr "Zainst.wer"
 
-#: dselect/pkgdisplay.cc:197
+#: dselect/pkgdisplay.cc
 msgid "dselect - recursive package listing"
 msgstr "dselect - lista konfliktów"
 
-#: dselect/pkgdisplay.cc:199
+#: dselect/pkgdisplay.cc
 msgid "dselect - inspection of package states"
 msgstr "dselect - stan pakietów"
 
-#: dselect/pkgdisplay.cc:200
+#: dselect/pkgdisplay.cc
 msgid "dselect - main package listing"
 msgstr "dselect - lista pakietów"
 
-#: dselect/pkgdisplay.cc:208
+#: dselect/pkgdisplay.cc
 msgid " (by section)"
 msgstr " (wg sekcji)"
 
-#: dselect/pkgdisplay.cc:211
+#: dselect/pkgdisplay.cc
 msgid " (avail., section)"
 msgstr " (dostępn., sekcja)"
 
-#: dselect/pkgdisplay.cc:214
+#: dselect/pkgdisplay.cc
 msgid " (status, section)"
 msgstr " (stan, sekcja)"
 
-#: dselect/pkgdisplay.cc:223
+#: dselect/pkgdisplay.cc
 msgid " (by priority)"
 msgstr " (wg priorytetu)"
 
-#: dselect/pkgdisplay.cc:226
+#: dselect/pkgdisplay.cc
 msgid " (avail., priority)"
 msgstr " (dostępn., priorytet)"
 
-#: dselect/pkgdisplay.cc:229
+#: dselect/pkgdisplay.cc
 msgid " (status, priority)"
 msgstr " (stan, priorytet)"
 
-#: dselect/pkgdisplay.cc:238
+#: dselect/pkgdisplay.cc
 msgid " (alphabetically)"
 msgstr " (alfabetycznie)"
 
-#: dselect/pkgdisplay.cc:241
+#: dselect/pkgdisplay.cc
 msgid " (by availability)"
 msgstr " (wg dostępności)"
 
-#: dselect/pkgdisplay.cc:244
+#: dselect/pkgdisplay.cc
 msgid " (by status)"
 msgstr " (wg stanu)"
 
-#: dselect/pkgdisplay.cc:259
+#: dselect/pkgdisplay.cc
 msgid " mark:+/=/- terse:v help:?"
 msgstr " wybór:+/=/- ogólnie:v pomoc:?"
 
-#: dselect/pkgdisplay.cc:260
+#: dselect/pkgdisplay.cc
 msgid " mark:+/=/- verbose:v help:?"
 msgstr " wybór:+/=/- szczegółowo:v pomoc:?"
 
-#: dselect/pkgdisplay.cc:262
+#: dselect/pkgdisplay.cc
 msgid " terse:v help:?"
 msgstr " ogólnie:v pomoc:?"
 
-#: dselect/pkgdisplay.cc:263
+#: dselect/pkgdisplay.cc
 msgid " verbose:v help:?"
 msgstr " szczegółowo:v pomoc:?"
 
-#: dselect/pkginfo.cc:85
+#: dselect/pkginfo.cc
 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 "
@@ -1583,80 +1612,110 @@ msgstr ""
 "Można użyć \"o\" lub \"O\", aby zmienić kolejność uporządkowania pakietów "
 "lub zaznaczyć pakiety z innych grup."
 
-#: dselect/pkginfo.cc:98
+#: dselect/pkginfo.cc
 msgid "Interrelationships"
 msgstr "Relacje"
 
-#: dselect/pkginfo.cc:117
+#: dselect/pkginfo.cc
 msgid "No description available."
 msgstr "Brak dostępnego opisu."
 
-#: dselect/pkginfo.cc:135
+#: dselect/pkginfo.cc
 msgid "Installed control file information"
 msgstr "Informacje o zainstalowanej wersji pakietu"
 
-#: dselect/pkginfo.cc:151
+#: dselect/pkginfo.cc
 msgid "Available control file information"
 msgstr "Informacje o dostępnej wersji pakietu"
 
-#: dselect/pkglist.cc:425
+#: dselect/pkglist.cc
 msgid "there are no packages"
 msgstr "nie ma żadnych pakietów"
 
-#: dselect/pkglist.cc:521
+#: dselect/pkglist.cc
 msgid "invalid search option given"
 msgstr "nieprawidłowa opcja wyszukiwania"
 
-#: dselect/pkglist.cc:536
+#: dselect/pkglist.cc
 msgid "error in regular expression"
 msgstr "błąd w wyrażeniu regularnym"
 
-#: dselect/pkgsublist.cc:111
+#: dselect/pkgsublist.cc
 msgid " does not appear to be available\n"
 msgstr " nie wydaje się być dostępny\n"
 
-#: dselect/pkgsublist.cc:131
+#: dselect/pkgsublist.cc
 msgid " or "
 msgstr " lub "
 
-#: dselect/pkgtop.cc:58
+#: dselect/pkgtop.cc
 msgid "All"
 msgstr "Wszystkie"
 
-#: dselect/pkgtop.cc:80
+#: dselect/pkgtop.cc
 msgid "All packages"
 msgstr "Wszystkie pakiety"
 
-#: dselect/pkgtop.cc:84
+#: dselect/pkgtop.cc
 #, c-format
 msgid "%s packages without a section"
 msgstr "%s pakiety bez sekcji"
 
-#: dselect/pkgtop.cc:86
+#: dselect/pkgtop.cc
 #, c-format
 msgid "%s packages in section %s"
 msgstr "%s pakiety w sekcji %s"
 
-#: dselect/pkgtop.cc:92
+#: dselect/pkgtop.cc
 #, c-format
 msgid "%s %s packages"
 msgstr "%s %s pakiety"
 
-#: dselect/pkgtop.cc:96
+#: dselect/pkgtop.cc
 #, c-format
 msgid "%s %s packages without a section"
 msgstr "%s %s pakiety bez sekcji"
 
-#: dselect/pkgtop.cc:98
+#: dselect/pkgtop.cc
 #, c-format
 msgid "%s %s packages in section %s"
 msgstr "%s %s pakiety w sekcji %s"
 
-#: dselect/pkgtop.cc:119
+#: dselect/pkgtop.cc
 #, c-format
 msgid "%-*s %s%s%s;  %s (was: %s).  %s"
 msgstr "%-*s %s%s%s;  %s (był: %s).  %s"
 
+#~ msgid "Actions:\n"
+#~ msgstr "Działania:\n"
+
+#~ msgid "Colours:\n"
+#~ msgstr "Kolory:\n"
+
+#~ msgid "Attributes:\n"
+#~ msgstr "Atrybuty:\n"
+
+#~ msgid "EOF before option name start"
+#~ msgstr "EOF przed nazwą opcji"
+
+#~ msgid "EOF before summary"
+#~ msgstr "EOF przed podsumowaniem"
+
+#~ msgid "!Bug!"
+#~ msgstr "!Błąd!"
+
+#~ msgid "Updated"
+#~ msgstr "Do aktualizacji"
+
+#~ msgid "Up-to-date"
+#~ msgstr "Aktualne"
+
+#~ msgid "Updated packages (newer version is available)"
+#~ msgstr "Pakiety do aktualizacji (dostępna nowsza wersja)"
+
+#~ msgid "Available packages (not currently installed)"
+#~ msgstr "Pakiety dostępne (jeszcze nie zainstalowane)"
+
 #~ msgid "foreign architectures enabled but multi-arch is not supported"
 #~ msgstr ""
 #~ "obce architektury są włączone, lecz nie skonfigurowano "
diff --git a/dselect/po/pt.po b/dselect/po/pt.po
index 37c0e88e2..01767ea1c 100644
--- a/dselect/po/pt.po
+++ b/dselect/po/pt.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dselect 1.17.0\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2014-12-23 18:12+0100\n"
+"POT-Creation-Date: 2015-04-06 09:37+0200\n"
 "PO-Revision-Date: 2014-11-30 13:28+0000\n"
 "Last-Translator: Miguel Figueiredo <elmig@debianpt.org>\n"
 "Language-Team: Portuguese <traduz@debianpt.org>\n"
@@ -15,28 +15,28 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: dselect/basecmds.cc:125
+#: dselect/basecmds.cc
 msgid "Search for ? "
 msgstr "Procurar por ? "
 
-#: dselect/basecmds.cc:149
+#: dselect/basecmds.cc
 msgid "Error: "
 msgstr "Erro: "
 
-#: dselect/basecmds.cc:180
+#: dselect/basecmds.cc
 msgid "Help: "
 msgstr "Ajuda: "
 
-#: dselect/basecmds.cc:186
+#: dselect/basecmds.cc
 msgid "Press ? for help menu, . for next topic, <space> to exit help."
 msgstr ""
 "Tecla ? para menu ajuda, . para próximo tópico, <espaço> sair da ajuda."
 
-#: dselect/basecmds.cc:193
+#: dselect/basecmds.cc
 msgid "Help information is available under the following topics:"
 msgstr "Informação de ajuda está disponível sob os seguintes tópicos:"
 
-#: dselect/basecmds.cc:201
+#: dselect/basecmds.cc
 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. "
@@ -44,239 +44,239 @@ msgstr ""
 "Carregue numa tecla da lista acima, <espaço> ou `q' para sair da ajuda,\n"
 "  ou `.' (ponto final) para ler de cada vez uma página de ajuda."
 
-#: dselect/basecmds.cc:207
+#: dselect/basecmds.cc
 msgid "error reading keyboard in help"
 msgstr "erro lendo o teclado na ajuda"
 
-#: dselect/baselist.cc:60
+#: dselect/baselist.cc
 msgid "ioctl(TIOCGWINSZ) failed"
 msgstr "ioctl(TIOCGWINSZ) falhou"
 
-#: dselect/baselist.cc:63
+#: dselect/baselist.cc
 msgid "doupdate in SIGWINCH handler failed"
 msgstr "doupdate no SIGWINCH handler falhou"
 
-#: dselect/baselist.cc:72
+#: dselect/baselist.cc
 msgid "failed to restore old SIGWINCH sigact"
 msgstr "falhou restaurar o antigo SIGWINCH sigact"
 
-#: dselect/baselist.cc:75
+#: dselect/baselist.cc
 msgid "failed to restore old signal mask"
 msgstr "falhou restaurar a antiga máscara de sinal"
 
-#: dselect/baselist.cc:86
+#: dselect/baselist.cc
 msgid "failed to get old signal mask"
 msgstr "falhou obter a velha máscara de sinal"
 
-#: dselect/baselist.cc:88
+#: dselect/baselist.cc
 msgid "failed to get old SIGWINCH sigact"
 msgstr "falhou obter o antigo SIGWINCH sigact"
 
-#: dselect/baselist.cc:93
+#: dselect/baselist.cc
 msgid "failed to block SIGWINCH"
 msgstr "falhou bloquear SIGWINCH"
 
-#: dselect/baselist.cc:99
+#: dselect/baselist.cc
 msgid "failed to set new SIGWINCH sigact"
 msgstr "falhou definir o novo SIGWINCH sigact"
 
-#: dselect/baselist.cc:174
+#: dselect/baselist.cc
 msgid "failed to allocate colour pair"
 msgstr "falhou alocar par de cores"
 
-#: dselect/baselist.cc:203
+#: dselect/baselist.cc
 msgid "failed to create title window"
 msgstr "falhou criar o título da janela"
 
-#: dselect/baselist.cc:207
+#: dselect/baselist.cc
 msgid "failed to create whatinfo window"
 msgstr "falhou criar a janela whatinfo"
 
-#: dselect/baselist.cc:211
+#: dselect/baselist.cc
 msgid "failed to create baselist pad"
 msgstr "falhou ao criar baselist pad"
 
-#: dselect/baselist.cc:214
+#: dselect/baselist.cc
 msgid "failed to create heading pad"
 msgstr "falhou ao criar heading pad"
 
-#: dselect/baselist.cc:218
+#: dselect/baselist.cc
 msgid "failed to create thisstate pad"
 msgstr "falhou ao criar thisstate pad"
 
-#: dselect/baselist.cc:222
+#: dselect/baselist.cc
 msgid "failed to create info pad"
 msgstr "falhou ao criar info pad"
 
-#: dselect/baselist.cc:227
+#: dselect/baselist.cc
 msgid "failed to create query window"
 msgstr "falhou ao criar janela de query"
 
-#: dselect/baselist.cc:298
+#: dselect/baselist.cc
 msgid "Keybindings"
 msgstr "Keybindings"
 
-#: dselect/baselist.cc:347
+#: dselect/baselist.cc
 #, c-format
 msgid "  -- %d%%, press "
 msgstr "  -- %d%%, pressione "
 
-#: dselect/baselist.cc:350
+#: dselect/baselist.cc
 #, c-format
 msgid "%s for more"
 msgstr "%s para mais"
 
-#: dselect/baselist.cc:354
+#: dselect/baselist.cc
 #, c-format
 msgid "%s to go back"
 msgstr "%s para voltar atrás"
 
-#: dselect/bindings.cc:78
+#: dselect/bindings.cc
 msgid "[not bound]"
 msgstr "[não ligado]"
 
-#: dselect/bindings.cc:82
+#: dselect/bindings.cc
 #, c-format
 msgid "[unk: %d]"
 msgstr "[desconhecido: %d]"
 
-#: dselect/bindings.cc:141
+#: dselect/bindings.cc
 msgid "Scroll onwards through help/information"
 msgstr "Scroll para a frente através da ajuda/informação"
 
-#: dselect/bindings.cc:142
+#: dselect/bindings.cc
 msgid "Scroll backwards through help/information"
 msgstr "Scroll para trás através da ajuda/informação"
 
-#: dselect/bindings.cc:143
+#: dselect/bindings.cc
 msgid "Move up"
 msgstr "Mover acima"
 
-#: dselect/bindings.cc:144
+#: dselect/bindings.cc
 msgid "Move down"
 msgstr "Mover abaixo"
 
-#: dselect/bindings.cc:145
+#: dselect/bindings.cc
 msgid "Go to top of list"
 msgstr "Ir para o inicio da lista"
 
-#: dselect/bindings.cc:146
+#: dselect/bindings.cc
 msgid "Go to end of list"
 msgstr "Ir para o fim da lista"
 
-#: dselect/bindings.cc:147
+#: dselect/bindings.cc
 msgid "Request help (cycle through help screens)"
 msgstr "Pedir ajuda (percorrer os ecrãs de ajuda)"
 
-#: dselect/bindings.cc:148
+#: dselect/bindings.cc
 msgid "Cycle through information displays"
 msgstr "Percorrer através das páginas de informação"
 
-#: dselect/bindings.cc:149
+#: dselect/bindings.cc
 msgid "Redraw display"
 msgstr "Redesenhar o ecrã"
 
-#: dselect/bindings.cc:150
+#: dselect/bindings.cc
 msgid "Scroll onwards through list by 1 line"
 msgstr "Scroll em frente na lista por 1 linha"
 
-#: dselect/bindings.cc:151
+#: dselect/bindings.cc
 msgid "Scroll backwards through list by 1 line"
 msgstr "Scroll para trás na lista por 1 linha"
 
-#: dselect/bindings.cc:152
+#: dselect/bindings.cc
 msgid "Scroll onwards through help/information by 1 line"
 msgstr "Scroll em frente através da ajuda/informação por 1 linha"
 
-#: dselect/bindings.cc:153
+#: dselect/bindings.cc
 msgid "Scroll backwards through help/information by 1 line"
 msgstr "Scroll para trás através da ajuda/informação por 1 linha"
 
-#: dselect/bindings.cc:154
+#: dselect/bindings.cc
 msgid "Scroll onwards through list"
 msgstr "Scroll em frente através da lista"
 
-#: dselect/bindings.cc:155
+#: dselect/bindings.cc
 msgid "Scroll backwards through list"
 msgstr "Scroll para trás através da lista"
 
-#: dselect/bindings.cc:158
+#: dselect/bindings.cc
 msgid "Mark package(s) for installation"
 msgstr "Marcar pacote(s) para instalação"
 
-#: dselect/bindings.cc:159
+#: dselect/bindings.cc
 msgid "Mark package(s) for deinstallation"
 msgstr "Marcar pacote(s) para desinstalação"
 
-#: dselect/bindings.cc:160
+#: dselect/bindings.cc
 msgid "Mark package(s) for deinstall and purge"
 msgstr "Marcar pacote(s) para desinstalar e apagar"
 
-#: dselect/bindings.cc:161
+#: dselect/bindings.cc
 msgid "Make highlight more specific"
 msgstr "Fazer o destaque mais específico"
 
-#: dselect/bindings.cc:162
+#: dselect/bindings.cc
 msgid "Make highlight less specific"
 msgstr "Fazer o destaque menos específico"
 
-#: dselect/bindings.cc:163
+#: dselect/bindings.cc
 msgid "Search for a package whose name contains a string"
 msgstr "Procurar por pacotes cujo nome contenham uma string"
 
-#: dselect/bindings.cc:164
+#: dselect/bindings.cc
 msgid "Repeat last search"
 msgstr "Repetir a última procura"
 
-#: dselect/bindings.cc:165
+#: dselect/bindings.cc
 msgid "Swap sort order priority/section"
 msgstr "Trocar ordem da ordenação prioridade/secção"
 
-#: dselect/bindings.cc:166
+#: dselect/bindings.cc
 msgid "Quit, confirming, and checking dependencies"
 msgstr "Sair, a confirmar, e verificar dependências"
 
-#: dselect/bindings.cc:167
+#: dselect/bindings.cc
 msgid "Quit, confirming without check"
 msgstr "Sair, confirmar sem verificar"
 
-#: dselect/bindings.cc:168
+#: dselect/bindings.cc
 msgid "Quit, rejecting conflict/dependency suggestions"
 msgstr "Sair, rejeitando sugestões de conflitos/dependências"
 
-#: dselect/bindings.cc:169
+#: dselect/bindings.cc
 msgid "Abort - quit without making changes"
 msgstr "Abortar - sair sem fazer alterações"
 
-#: dselect/bindings.cc:170
+#: dselect/bindings.cc
 msgid "Revert to old state for all packages"
 msgstr "Voltar ao estado antigo para todos os pacotes"
 
-#: dselect/bindings.cc:171
+#: dselect/bindings.cc
 msgid "Revert to suggested state for all packages"
 msgstr "Voltar ao estado sugerido para todos os pacotes"
 
-#: dselect/bindings.cc:172
+#: dselect/bindings.cc
 msgid "Revert to directly requested state for all packages"
 msgstr "Voltar ao estado directamente requisitado para todos os pacotes"
 
-#: dselect/bindings.cc:173
+#: dselect/bindings.cc
 msgid "Revert to currently installed state for all packages"
 msgstr "Voltar ao estado actualmente instalado para todos os pacotes"
 
-#: dselect/bindings.cc:176
+#: dselect/bindings.cc
 msgid "Select currently-highlighted access method"
 msgstr "Seleccionar o método de acesso actualmente destacado"
 
-#: dselect/bindings.cc:177
+#: dselect/bindings.cc
 msgid "Quit without changing selected access method"
 msgstr "Sair sem alterar o método de acesso seleccionado"
 
-#: dselect/helpmsgs.cc:29
+#: dselect/helpmsgs.cc
 msgid "Keystrokes"
 msgstr "Combinações de teclas"
 
-#: dselect/helpmsgs.cc:29
+#: dselect/helpmsgs.cc
 msgid ""
 "Motion keys: Next/Previous, Top/End, Up/Down, Backwards/Forwards:\n"
 "  j, Down-arrow         k, Up-arrow             move highlight\n"
@@ -338,11 +338,11 @@ msgstr ""
 "   D     colocar tudo em est. Directamente req. n, \\ repetir última "
 "procura\n"
 
-#: dselect/helpmsgs.cc:55
+#: dselect/helpmsgs.cc
 msgid "Introduction to package selections"
 msgstr "Introdução à selecção de pacotes"
 
-#: dselect/helpmsgs.cc:55
+#: dselect/helpmsgs.cc
 msgid ""
 "Welcome to dselect's main package listing.\n"
 "\n"
@@ -397,11 +397,11 @@ msgstr ""
 "\n"
 "Carregue em <espaço> para sair da ajuda e entrar agora na lista.\n"
 
-#: dselect/helpmsgs.cc:80
+#: dselect/helpmsgs.cc
 msgid "Introduction to read-only package list browser"
 msgstr "Introdução ao navegador de lista de pacotes só de leitura"
 
-#: dselect/helpmsgs.cc:80
+#: dselect/helpmsgs.cc
 msgid ""
 "Welcome to dselect's main package listing.\n"
 "\n"
@@ -438,11 +438,11 @@ msgstr ""
 "\n"
 "Carregue em <enter> para deixar a ajuda e entrar agora na lista.\n"
 
-#: dselect/helpmsgs.cc:99
+#: dselect/helpmsgs.cc
 msgid "Introduction to conflict/dependency resolution sub-list"
 msgstr "Introdução à sub-lista de resolução de conflitos/dependências"
 
-#: dselect/helpmsgs.cc:99
+#: dselect/helpmsgs.cc
 msgid ""
 "Dependency/conflict resolution - introduction.\n"
 "\n"
@@ -504,11 +504,11 @@ msgstr ""
 "Carregue em <espaço> para sair da ajuda e entrar na sub-lista; lembre-se: "
 "para ajuda carregue em `?'.\n"
 
-#: dselect/helpmsgs.cc:125
+#: dselect/helpmsgs.cc
 msgid "Display, part 1: package listing and status chars"
 msgstr "Visualização, parte 1: lista de pacotes e caracteres de status"
 
-#: dselect/helpmsgs.cc:125
+#: dselect/helpmsgs.cc
 msgid ""
 "The top half of the screen shows a list of packages.  For each package you "
 "see\n"
@@ -574,11 +574,11 @@ msgstr ""
 "instalada e da disponível de cada pacote (shift-V para mostrar/esconder)\n"
 "e a descrição resumida.\n"
 
-#: dselect/helpmsgs.cc:152
+#: dselect/helpmsgs.cc
 msgid "Display, part 2: list highlight; information display"
 msgstr "Visualização, parte 3: Destacar na lista; mostra de informação"
 
-#: dselect/helpmsgs.cc:152
+#: dselect/helpmsgs.cc
 msgid ""
 "* Highlight: One line in the package list will be highlighted.  It "
 "indicates\n"
@@ -627,11 +627,11 @@ msgstr ""
 "  Use a tecla `i' para circular pelas telas, e `I' para esconder essa\n"
 "  tela de informação ou expandí-la por quase toda a tela.\n"
 
-#: dselect/helpmsgs.cc:176
+#: dselect/helpmsgs.cc
 msgid "Introduction to method selection display"
 msgstr "Introdução ao acrã de métodos de selecção"
 
-#: dselect/helpmsgs.cc:176
+#: dselect/helpmsgs.cc
 msgid ""
 "dselect and dpkg can do automatic installation, loading the package files to "
 "be\n"
@@ -676,11 +676,11 @@ msgstr ""
 "menu\n"
 "de ajuda acessível pressionando `?'.\n"
 
-#: dselect/helpmsgs.cc:196
+#: dselect/helpmsgs.cc
 msgid "Keystrokes for method selection"
 msgstr "Teclas para selecção de método"
 
-#: dselect/helpmsgs.cc:196
+#: dselect/helpmsgs.cc
 msgid ""
 "Motion keys: Next/Previous, Top/End, Up/Down, Backwards/Forwards:\n"
 "  j, Down-arrow         k, Up-arrow             move highlight\n"
@@ -727,104 +727,104 @@ msgstr ""
 "  /               procurar (enter para cancelar)\n"
 "  \\               repetir última busca\n"
 
-#: dselect/main.cc:63
+#: dselect/main.cc
 msgid "Type dselect --help for help."
 msgstr "Escreva dselect --help para ajuda."
 
-#: dselect/main.cc:145
+#: dselect/main.cc
 msgid "a"
 msgstr "a"
 
-#: dselect/main.cc:145
+#: dselect/main.cc
 msgid "[A]ccess"
 msgstr "[A]cesso"
 
-#: dselect/main.cc:145
+#: dselect/main.cc
 msgid "Choose the access method to use."
 msgstr "Escolha o método a utilizar."
 
-#: dselect/main.cc:146
+#: dselect/main.cc
 msgid "u"
 msgstr "u"
 
-#: dselect/main.cc:146
+#: dselect/main.cc
 msgid "[U]pdate"
 msgstr "Act[U]alizar"
 
-#: dselect/main.cc:146
+#: dselect/main.cc
 msgid "Update list of available packages, if possible."
 msgstr "Actualizar a lista de pacotes disponíveis, se possível."
 
-#: dselect/main.cc:147
+#: dselect/main.cc
 msgid "s"
 msgstr "s"
 
-#: dselect/main.cc:147
+#: dselect/main.cc
 msgid "[S]elect"
 msgstr "[S]eleccionar"
 
-#: dselect/main.cc:147
+#: dselect/main.cc
 msgid "Request which packages you want on your system."
 msgstr "Solicite quais pacotes quer no seu sistema."
 
-#: dselect/main.cc:148
+#: dselect/main.cc
 msgid "i"
 msgstr "i"
 
-#: dselect/main.cc:148
+#: dselect/main.cc
 msgid "[I]nstall"
 msgstr "[I]nstalar"
 
-#: dselect/main.cc:148
+#: dselect/main.cc
 msgid "Install and upgrade wanted packages."
 msgstr "Instalar e actualizar os pacotes desejados."
 
-#: dselect/main.cc:149
+#: dselect/main.cc
 msgid "c"
 msgstr "c"
 
-#: dselect/main.cc:149
+#: dselect/main.cc
 msgid "[C]onfig"
 msgstr "[C]onfig"
 
-#: dselect/main.cc:149
+#: dselect/main.cc
 msgid "Configure any packages that are unconfigured."
 msgstr "Configura pacotes ainda não configurados."
 
-#: dselect/main.cc:150
+#: dselect/main.cc
 msgid "r"
 msgstr "r"
 
-#: dselect/main.cc:150
+#: dselect/main.cc
 msgid "[R]emove"
 msgstr "[R]emover"
 
-#: dselect/main.cc:150
+#: dselect/main.cc
 msgid "Remove unwanted software."
 msgstr "Remover software não desejado"
 
-#: dselect/main.cc:151
+#: dselect/main.cc
 msgid "q"
 msgstr "q"
 
-#: dselect/main.cc:151
+#: dselect/main.cc
 msgid "[Q]uit"
 msgstr "[Q] Sair"
 
-#: dselect/main.cc:151
+#: dselect/main.cc
 msgid "Quit dselect."
 msgstr "Sair do dselect."
 
-#: dselect/main.cc:152
+#: dselect/main.cc
 msgid "menu"
 msgstr "menu"
 
-#: dselect/main.cc:157
+#: dselect/main.cc
 #, c-format
 msgid "Debian `%s' package handling frontend version %s.\n"
 msgstr "Frontend de gestão de pacotes Debian `%s' versão %s.\n"
 
-#: dselect/main.cc:160
+#: dselect/main.cc
 msgid ""
 "This is free software; see the GNU General Public License version 2 or\n"
 "later for copying conditions. There is NO warranty.\n"
@@ -832,29 +832,47 @@ msgstr ""
 "Isto é software livre; veja a GNU General Public License versão 2 ou\n"
 "posterior para condições de cópia. Não existe NENHUMA garantia.\n"
 
-#: dselect/main.cc:169 dselect/main.cc:217
+#: dselect/main.cc
 msgid "<standard output>"
 msgstr "<standard output>"
 
-#: dselect/main.cc:180
-#, c-format
+#: dselect/main.cc
+#, fuzzy, c-format
+#| msgid ""
+#| "Usage: %s [<option> ...] [<action> ...]\n"
+#| "\n"
 msgid ""
-"Usage: %s [<option> ...] [<action> ...]\n"
+"Usage: %s [<option>...] [<command>...]\n"
 "\n"
 msgstr ""
 "Utilização: %s [<opção> ...] [<acção> ...]\n"
 "\n"
 
-#: dselect/main.cc:184
+#: dselect/main.cc
 #, c-format
+msgid "Commands:\n"
+msgstr ""
+
+#: dselect/main.cc
+#, fuzzy, c-format
+#| msgid ""
+#| "Options:\n"
+#| "  --admindir <directory>     Use <directory> instead of %s.\n"
+#| "  --expert                   Turn on expert mode.\n"
+#| "  --debug <file> | -D<file>  Turn on debugging, sending output to "
+#| "<file>.\n"
+#| "  --colour | --color screenpart:[foreground],[background][:attr[+attr"
+#| "+...]]\n"
+#| "                             Configure screen colours.\n"
+#| "\n"
 msgid ""
 "Options:\n"
-"  --admindir <directory>     Use <directory> instead of %s.\n"
-"  --expert                   Turn on expert mode.\n"
-"  --debug <file> | -D<file>  Turn on debugging, sending output to <file>.\n"
-"  --colour | --color screenpart:[foreground],[background][:attr[+attr+...]]\n"
-"                             Configure screen colours.\n"
-"\n"
+"      --admindir <directory>       Use <directory> instead of %s.\n"
+"      --expert                     Turn on expert mode.\n"
+"  -D, --debug <file>               Turn on debugging, send output to "
+"<file>.\n"
+"      --color <color-spec>         Configure screen colors.\n"
+"      --colour <color-spec>        Ditto.\n"
 msgstr ""
 "Opções:\n"
 "  --admindir <directório>    Usar <directório> em vez de %s.\n"
@@ -865,72 +883,79 @@ msgstr ""
 "                             Configurar as cores do ecrã.\n"
 "\n"
 
-#: dselect/main.cc:193
-#, c-format
+#: dselect/main.cc
+#, fuzzy, c-format
+#| msgid ""
+#| "  --help                     Show this help message.\n"
+#| "  --version                  Show the version.\n"
+#| "\n"
 msgid ""
-"  --help                     Show this help message.\n"
-"  --version                  Show the version.\n"
+"  -?, --help                       Show this help message.\n"
+"      --version                    Show the version.\n"
 "\n"
 msgstr ""
 "  --help\t\t      Mostrar esta mensagem de ajuda.\n"
 "  --version                  Mostrar a versão.\n"
 "\n"
 
-#: dselect/main.cc:197
+#: dselect/main.cc
 #, c-format
-msgid "Actions:\n"
-msgstr "Acções:\n"
+msgid ""
+"<color-spec> is <screen-part>:[<foreground>],[<background>][:"
+"<attr>[+<attr>]...]\n"
+msgstr ""
 
-#: dselect/main.cc:202
-#, c-format
-msgid "Screenparts:\n"
+#: dselect/main.cc
+#, fuzzy, c-format
+#| msgid "Screenparts:\n"
+msgid "<screen-part> is:"
 msgstr "Screenparts:\n"
 
-#: dselect/main.cc:207
+#: dselect/main.cc
 #, c-format
-msgid "Colours:\n"
-msgstr "Cores:\n"
+msgid "<color> is:"
+msgstr ""
 
-#: dselect/main.cc:212
+#: dselect/main.cc
 #, c-format
-msgid "Attributes:\n"
-msgstr "Atributos:\n"
+msgid "<attr> is:"
+msgstr ""
 
-#: dselect/main.cc:232
+#: dselect/main.cc
 #, c-format
 msgid "couldn't open debug file `%.255s'\n"
 msgstr "não pode abrir ficheiro de debug `%.255s'\n"
 
-#: dselect/main.cc:253
+#: dselect/main.cc
 #, c-format
 msgid "invalid %s '%s'"
 msgstr "%s inválido '%s'"
 
-#: dselect/main.cc:272
+#: dselect/main.cc
 msgid "screen part"
 msgstr "screen part"
 
-#: dselect/main.cc:278
+#: dselect/main.cc
 msgid "null colour specification"
 msgstr "especificação de cor nula"
 
-#: dselect/main.cc:286 dselect/main.cc:291
+#: dselect/main.cc
 msgid "colour"
 msgstr "cor"
 
-#: dselect/main.cc:299
+#: dselect/main.cc
 msgid "colour attribute"
 msgstr "atributo de cor"
 
-#: dselect/main.cc:333
+#: dselect/main.cc
 msgid "Terminal does not appear to support cursor addressing.\n"
 msgstr "O terminal não parece suportar endereçamento do cursor.\n"
 
-#: dselect/main.cc:335
+#: dselect/main.cc
 msgid "Terminal does not appear to support highlighting.\n"
 msgstr "O terminal não parece suportar highlighting\n"
 
-#: dselect/main.cc:337
+#: dselect/main.cc
 #, c-format
 msgid ""
 "Set your TERM variable correctly, use a better terminal,\n"
@@ -939,11 +964,11 @@ msgstr ""
 "Defina correctamente a veriável TERM, utilize um terminal melhor,\n"
 "ou faça-o com a ferramente de gestão por pacote %s.\n"
 
-#: dselect/main.cc:340
+#: dselect/main.cc
 msgid "terminal lacks necessary features, giving up"
 msgstr "o terminal carece de funcionalidades necessárias, desistindo"
 
-#: dselect/main.cc:425
+#: dselect/main.cc
 msgid ""
 "\n"
 "\n"
@@ -956,7 +981,7 @@ msgstr ""
 "Mova-se com ^P e ^N, teclas de cursor, letras iniciais, ou digitos;\n"
 "Carregue em <enter> para confirmar a selecção.   ^L re-desenha o ecrã.\n"
 
-#: dselect/main.cc:430
+#: dselect/main.cc
 msgid ""
 "Copyright (C) 1994-1996 Ian Jackson.\n"
 "Copyright (C) 2000,2001 Wichert Akkerman.\n"
@@ -964,7 +989,7 @@ msgstr ""
 "Copyright (C) 1994-1996 Ian Jackson.\n"
 "Copyright (C) 2000,2001 Wichert Akkerman.\n"
 
-#: dselect/main.cc:436
+#: dselect/main.cc
 msgid ""
 "\n"
 "\n"
@@ -974,57 +999,57 @@ msgstr ""
 "\n"
 "Acesso apenas de leitura: só está disponível a visualização!"
 
-#: dselect/main.cc:455
+#: dselect/main.cc
 msgid "failed to getch in main menu"
 msgstr "falhou o getch no menu principal"
 
-#: dselect/main.cc:538
+#: dselect/main.cc
 #, c-format
 msgid "unknown action string `%.50s'"
 msgstr "string de acção desconhecida `%.50s'"
 
-#: dselect/methlist.cc:66
+#: dselect/methlist.cc
 msgid "Abbrev."
 msgstr "Abrev."
 
-#: dselect/methlist.cc:67 dselect/pkgdisplay.cc:188 dselect/pkginfo.cc:110
+#: dselect/methlist.cc dselect/pkgdisplay.cc dselect/pkginfo.cc
 msgid "Description"
 msgstr "Descrição"
 
-#: dselect/methlist.cc:73
+#: dselect/methlist.cc
 msgid "dselect - list of access methods"
 msgstr "dselect - lista de métodos de acesso"
 
-#: dselect/methlist.cc:82
+#: dselect/methlist.cc
 #, c-format
 msgid "Access method `%s'."
 msgstr "Método de acesso `%s'."
 
-#: dselect/methlist.cc:161 dselect/pkglist.cc:587
+#: dselect/methlist.cc dselect/pkglist.cc
 msgid "doupdate failed"
 msgstr "falhou doupdate"
 
-#: dselect/methlist.cc:164 dselect/pkglist.cc:590
+#: dselect/methlist.cc dselect/pkglist.cc
 msgid "failed to unblock SIGWINCH"
 msgstr "falha ao desbloquear SIGWINCH"
 
-#: dselect/methlist.cc:169 dselect/pkglist.cc:595
+#: dselect/methlist.cc dselect/pkglist.cc
 msgid "failed to re-block SIGWINCH"
 msgstr "falhou re-bloquear SIGWINCH"
 
-#: dselect/methlist.cc:170 dselect/pkglist.cc:597
+#: dselect/methlist.cc dselect/pkglist.cc
 msgid "getch failed"
 msgstr "falhou getch"
 
-#: dselect/methlist.cc:187
+#: dselect/methlist.cc
 msgid "Explanation"
 msgstr "Explicação de "
 
-#: dselect/methlist.cc:197
+#: dselect/methlist.cc
 msgid "No explanation available."
 msgstr "Sem explicação disponível."
 
-#: dselect/method.cc:67
+#: dselect/method.cc
 #, c-format
 msgid ""
 "\n"
@@ -1035,7 +1060,7 @@ msgstr ""
 "\n"
 "%s: %s\n"
 
-#: dselect/method.cc:70
+#: dselect/method.cc
 msgid ""
 "\n"
 "Press <enter> to continue."
@@ -1043,189 +1068,199 @@ msgstr ""
 "\n"
 "Carregue em <enter> para continuar."
 
-#: dselect/method.cc:82
+#: dselect/method.cc
 msgid "cannot unlock access method area"
 msgstr "não consegue retirar o acesso exclusivo à área do método de acesso"
 
-#: dselect/method.cc:96
+#: dselect/method.cc
 msgid "no access methods are available"
 msgstr "não estão disponíveis métodos de acesso"
 
-#: dselect/method.cc:115
+#: dselect/method.cc
 msgid "requested operation requires superuser privilege"
 msgstr "a operação pedida necessita de privilégio de super-utilizador"
 
-#: dselect/method.cc:118
+#: dselect/method.cc
 msgid "cannot open or create access method lockfile"
 msgstr ""
 "não consegue abrir ou criar o ficheiro de acesso exclusivo do método de "
 "acesso"
 
-#: dselect/method.cc:125
+#: dselect/method.cc
 msgid "the access method area is already locked"
 msgstr "a área do método de acesso já tem acesso exclusivo"
 
-#: dselect/method.cc:128
+#: dselect/method.cc
 msgid "cannot lock access method area"
 msgstr "não consegue acesso exclusivo à área de métodp de acesso"
 
-#: dselect/method.cc:161
+#: dselect/method.cc
 #, c-format
 msgid "Press <enter> to continue.\n"
 msgstr "Carregue em <enter> para continuar.\n"
 
-#: dselect/method.cc:162
+#: dselect/method.cc
 msgid "<standard error>"
 msgstr "<standard error>"
 
-#: dselect/method.cc:165
+#: dselect/method.cc
 msgid "error reading acknowledgement of program failure message"
 msgstr "erro lendo reconhecimento da mensagem de falha do programa"
 
-#: dselect/method.cc:187
+#: dselect/method.cc
 msgid "no access method is selected or configured"
 msgstr "não está escolhido ou configurado um método de acesso"
 
-#: dselect/method.cc:196
+#: dselect/method.cc
 msgid "update available list script"
 msgstr "script de actualização de lista de disponíveis"
 
-#: dselect/method.cc:200
+#: dselect/method.cc
 msgid "installation script"
 msgstr "script de instalação"
 
-#: dselect/method.cc:246
+#: dselect/method.cc
 msgid "query/setup script"
 msgstr "script de query/setup"
 
-#: dselect/methparse.cc:53
+#: dselect/methparse.cc
 #, c-format
 msgid "syntax error in method options file `%.250s' -- %s"
 msgstr "erro de sintaxe no ficheiro de opções de método `%.250s' -- %s"
 
-#: dselect/methparse.cc:59
+#: dselect/methparse.cc
 #, c-format
 msgid "error reading options file `%.250s'"
 msgstr "erro lendo o ficheiro de opções `%.250s'"
 
-#: dselect/methparse.cc:93
+#: dselect/methparse.cc
 #, c-format
 msgid "unable to read `%.250s' directory for reading methods"
 msgstr "não foi possível ler o directório `%.250s' para métodos de leitura"
 
-#: dselect/methparse.cc:109
+#: dselect/methparse.cc
 #, c-format
 msgid "method `%.250s' has name that is too long (%d > %d characters)"
 msgstr ""
 "o método `%.250s' tem um nome que é demasiado comprido (%d > %d caracteres)"
 
-#: dselect/methparse.cc:120
+#: dselect/methparse.cc
 #, c-format
 msgid "unable to access method script `%.250s'"
 msgstr "não foi possível aceder ao script do método `%.250s'"
 
-#: dselect/methparse.cc:126
+#: dselect/methparse.cc
 #, c-format
 msgid "unable to read method options file `%.250s'"
 msgstr "não foi possível ler ficheiro de opções de método `%.250s'"
 
-#: dselect/methparse.cc:150
+#: dselect/methparse.cc
 msgid "non-digit where digit wanted"
 msgstr "não dígito onde é esperado dígito"
 
-#: dselect/methparse.cc:153
-msgid "EOF in index string"
+#: dselect/methparse.cc
+#, fuzzy
+#| msgid "EOF in index string"
+msgid "end of file in index string"
 msgstr "EOF no index da string"
 
-#: dselect/methparse.cc:156
+#: dselect/methparse.cc
 msgid "index string too long"
 msgstr "index da string demasiado comprido"
 
-#: dselect/methparse.cc:159
+#: dselect/methparse.cc
 msgid "newline before option name start"
 msgstr "newline antes antes de começar nome de opção"
 
-#: dselect/methparse.cc:161
-msgid "EOF before option name start"
-msgstr "EOF antes de começar nome de opção"
+#: dselect/methparse.cc
+#, fuzzy
+#| msgid "newline before option name start"
+msgid "end of file before option name start"
+msgstr "newline antes antes de começar nome de opção"
 
-#: dselect/methparse.cc:165
+#: dselect/methparse.cc
 msgid "nonalpha where option name start wanted"
 msgstr "não-alfanumérico onde era necessário o início do nome de opção"
 
-#: dselect/methparse.cc:167
+#: dselect/methparse.cc
 msgid "non-alphanum in option name"
 msgstr "não alfanumérico no nome de opção"
 
-#: dselect/methparse.cc:170
-msgid "EOF in option name"
+#: dselect/methparse.cc
+#, fuzzy
+#| msgid "EOF in option name"
+msgid "end of file in option name"
 msgstr "EOF no nome de opção"
 
-#: dselect/methparse.cc:175
+#: dselect/methparse.cc
 msgid "newline before summary"
 msgstr "newline antes do sumário"
 
-#: dselect/methparse.cc:177
-msgid "EOF before summary"
-msgstr "EOF antes do sumário"
+#: dselect/methparse.cc
+#, fuzzy
+#| msgid "newline before summary"
+msgid "end of file before summary"
+msgstr "newline antes do sumário"
 
-#: dselect/methparse.cc:183
-msgid "EOF in summary - missing newline"
+#: dselect/methparse.cc
+#, fuzzy
+#| msgid "EOF in summary - missing newline"
+msgid "end of file in summary - missing newline"
 msgstr "EOF no sumário - falta newline"
 
-#: dselect/methparse.cc:193
+#: dselect/methparse.cc
 #, c-format
 msgid "unable to open option description file `%.250s'"
 msgstr "não foi possível abrir ficheiro de descrição de opções `%.250s'"
 
-#: dselect/methparse.cc:197
+#: dselect/methparse.cc
 #, c-format
 msgid "unable to stat option description file `%.250s'"
 msgstr ""
 "não foi possível fazer stat ao ficheiro de descrição de opções `%.250s'"
 
-#: dselect/methparse.cc:201
+#: dselect/methparse.cc
 #, c-format
 msgid "failed to read option description file `%.250s'"
 msgstr "falhou ler ficheiro de descrição de opções `%.250s'"
 
-#: dselect/methparse.cc:204
+#: dselect/methparse.cc
 #, c-format
 msgid "error during read of option description file `%.250s'"
 msgstr "erro durante a leitura do ficheiro de descrição de opções `%.250s'"
 
-#: dselect/methparse.cc:227
+#: dselect/methparse.cc
 #, c-format
 msgid "error during read of method options file `%.250s'"
 msgstr "erro durante a leitura do ficheiro de opções de método `%.250s'"
 
-#: dselect/methparse.cc:250
+#: dselect/methparse.cc
 #, c-format
 msgid "unable to open current option file `%.250s'"
 msgstr "não foi possível abrir o ficheiro de opções actual `%.250s'"
 
-#: dselect/methparse.cc:286
+#: dselect/methparse.cc
 #, c-format
 msgid "unable to write new option to `%.250s'"
 msgstr "não foi possível gravar nova opção para `%.250s'"
 
-#: dselect/pkgdisplay.cc:36
+#: dselect/pkgdisplay.cc
 msgid "new package"
 msgstr "novo pacote"
 
-#: dselect/pkgdisplay.cc:37
+#: dselect/pkgdisplay.cc
 msgid "install"
 msgstr "instalar"
 
-#: dselect/pkgdisplay.cc:38
+#: dselect/pkgdisplay.cc
 msgid "hold"
 msgstr "manter"
 
-#: dselect/pkgdisplay.cc:39
+#: dselect/pkgdisplay.cc
 msgid "remove"
 msgstr "remover"
 
-#: dselect/pkgdisplay.cc:40
+#: dselect/pkgdisplay.cc
 msgid "purge"
 msgstr "purgar"
 
@@ -1233,327 +1268,321 @@ msgstr "purgar"
 #. * the empty string to store information about the translation. DO NOT
 #. * CHANGE THAT IN A TRANSLATION! The code really relies on that being
 #. * a single space.
-#: dselect/pkgdisplay.cc:47
+#: dselect/pkgdisplay.cc
 msgid " "
 msgstr " "
 
-#: dselect/pkgdisplay.cc:48
+#: dselect/pkgdisplay.cc
 msgid "REINSTALL"
 msgstr "REINSTALAR"
 
-#: dselect/pkgdisplay.cc:51
+#: dselect/pkgdisplay.cc
 msgid "not installed"
 msgstr "não instalado"
 
-#: dselect/pkgdisplay.cc:52
+#: dselect/pkgdisplay.cc
 msgid "removed (configs remain)"
 msgstr "removido (as configurações mantém-se)"
 
-#: dselect/pkgdisplay.cc:53
+#: dselect/pkgdisplay.cc
 msgid "half installed"
 msgstr "semi-instalado"
 
-#: dselect/pkgdisplay.cc:54
+#: dselect/pkgdisplay.cc
 msgid "unpacked (not set up)"
 msgstr "descompactado (não configurado)"
 
-#: dselect/pkgdisplay.cc:55
+#: dselect/pkgdisplay.cc
 msgid "half configured (config failed)"
 msgstr "meio configurado (falhou a configuração)"
 
-#: dselect/pkgdisplay.cc:56
+#: dselect/pkgdisplay.cc
 msgid "awaiting trigger processing"
 msgstr "a aguardar o processamento de 'trigger'"
 
-#: dselect/pkgdisplay.cc:57
+#: dselect/pkgdisplay.cc
 msgid "triggered"
 msgstr "feito o 'trigger'"
 
-#: dselect/pkgdisplay.cc:58
+#: dselect/pkgdisplay.cc
 msgid "installed"
 msgstr "instalado"
 
-#: dselect/pkgdisplay.cc:61
+#: dselect/pkgdisplay.cc
 msgid "Required"
 msgstr "Necessário"
 
-#: dselect/pkgdisplay.cc:62
+#: dselect/pkgdisplay.cc
 msgid "Important"
 msgstr "Importante"
 
-#: dselect/pkgdisplay.cc:63
+#: dselect/pkgdisplay.cc
 msgid "Standard"
 msgstr "Standard"
 
-#: dselect/pkgdisplay.cc:64
+#: dselect/pkgdisplay.cc
 msgid "Optional"
 msgstr "Opcional"
 
-#: dselect/pkgdisplay.cc:65
+#: dselect/pkgdisplay.cc
 msgid "Extra"
 msgstr "Extra"
 
-#: dselect/pkgdisplay.cc:66
-msgid "!Bug!"
-msgstr "!Bug!"
-
-#: dselect/pkgdisplay.cc:67
+#: dselect/pkgdisplay.cc
 msgid "Unclassified"
 msgstr "Não classificado"
 
-#: dselect/pkgdisplay.cc:70
+#: dselect/pkgdisplay.cc
 msgid "suggests"
 msgstr "sugere"
 
-#: dselect/pkgdisplay.cc:71
+#: dselect/pkgdisplay.cc
 msgid "recommends"
 msgstr "recomenda"
 
-#: dselect/pkgdisplay.cc:72
+#: dselect/pkgdisplay.cc
 msgid "depends on"
 msgstr "depende de"
 
-#: dselect/pkgdisplay.cc:73
+#: dselect/pkgdisplay.cc
 msgid "pre-depends on"
 msgstr "pre-depende de"
 
-#: dselect/pkgdisplay.cc:74
+#: dselect/pkgdisplay.cc
 msgid "breaks"
 msgstr "estraga"
 
-#: dselect/pkgdisplay.cc:75
+#: dselect/pkgdisplay.cc
 msgid "conflicts with"
 msgstr "em conflito com"
 
-#: dselect/pkgdisplay.cc:76
+#: dselect/pkgdisplay.cc
 msgid "provides"
 msgstr "disponibiliza"
 
-#: dselect/pkgdisplay.cc:77
+#: dselect/pkgdisplay.cc
 msgid "replaces"
 msgstr "substitui"
 
-#: dselect/pkgdisplay.cc:78
+#: dselect/pkgdisplay.cc
 msgid "enhances"
 msgstr "melhora"
 
-#: dselect/pkgdisplay.cc:81
+#: dselect/pkgdisplay.cc
 msgid "Req"
 msgstr "Nec"
 
-#: dselect/pkgdisplay.cc:82
+#: dselect/pkgdisplay.cc
 msgid "Imp"
 msgstr "Imp"
 
-#: dselect/pkgdisplay.cc:83
+#: dselect/pkgdisplay.cc
 msgid "Std"
 msgstr "Std"
 
-#: dselect/pkgdisplay.cc:84
+#: dselect/pkgdisplay.cc
 msgid "Opt"
 msgstr "Opc"
 
-#: dselect/pkgdisplay.cc:85
+#: dselect/pkgdisplay.cc
 msgid "Xtr"
 msgstr "Xtr"
 
-#: dselect/pkgdisplay.cc:86
+#: dselect/pkgdisplay.cc
 msgid "bUG"
 msgstr "bUG"
 
-#: dselect/pkgdisplay.cc:87
+#: dselect/pkgdisplay.cc
 msgid "?"
 msgstr "?"
 
-#: dselect/pkgdisplay.cc:95 dselect/pkgdisplay.cc:115
+#: dselect/pkgdisplay.cc
 msgid "Broken"
 msgstr "Danificado"
 
-#: dselect/pkgdisplay.cc:96
+#: dselect/pkgdisplay.cc
 msgid "New"
 msgstr "Novo"
 
-#: dselect/pkgdisplay.cc:97
-msgid "Updated"
-msgstr "Actualizado"
+#: dselect/pkgdisplay.cc
+msgid "Upgradable"
+msgstr ""
 
-#: dselect/pkgdisplay.cc:98
+#: dselect/pkgdisplay.cc
 msgid "Obsolete/local"
 msgstr "Obsoleto/local"
 
-#: dselect/pkgdisplay.cc:99
-msgid "Up-to-date"
-msgstr "Actualizados"
+#: dselect/pkgdisplay.cc
+msgid "Installed"
+msgstr "Instalado"
 
-#: dselect/pkgdisplay.cc:100
+#: dselect/pkgdisplay.cc
 msgid "Available"
 msgstr "Disponíveis"
 
-#: dselect/pkgdisplay.cc:101 dselect/pkgdisplay.cc:117
+#: dselect/pkgdisplay.cc
 msgid "Removed"
 msgstr "Removidos"
 
-#: dselect/pkgdisplay.cc:102 dselect/pkgdisplay.cc:111
+#: dselect/pkgdisplay.cc
 msgid "Brokenly installed packages"
 msgstr "Pacotes instalados danificados"
 
-#: dselect/pkgdisplay.cc:103
+#: dselect/pkgdisplay.cc
 msgid "Newly available packages"
 msgstr "Novos pacotes disponíveis"
 
-#: dselect/pkgdisplay.cc:104
-msgid "Updated packages (newer version is available)"
-msgstr "Pacotes actualizados (está disponível versão mais recente)"
+#: dselect/pkgdisplay.cc
+#, fuzzy
+#| msgid "Newly available packages"
+msgid "Upgradable packages"
+msgstr "Novos pacotes disponíveis"
 
-#: dselect/pkgdisplay.cc:105
-msgid "Obsolete and local packages present on system"
+#: dselect/pkgdisplay.cc
+#, fuzzy
+#| msgid "Obsolete and local packages present on system"
+msgid "Obsolete and locally created packages"
 msgstr "Pacotes obsoletos e locais presentes no sistema"
 
-#: dselect/pkgdisplay.cc:106
-msgid "Up to date installed packages"
-msgstr "Pacotes instalados actualizados"
+#: dselect/pkgdisplay.cc
+msgid "Installed packages"
+msgstr "Pacotes instalados"
 
-#: dselect/pkgdisplay.cc:107
-msgid "Available packages (not currently installed)"
-msgstr "Pacotes disponíveis (não instalados actualmente)"
+#: dselect/pkgdisplay.cc
+#, fuzzy
+#| msgid "Up to date installed packages"
+msgid "Available not installed packages"
+msgstr "Pacotes instalados actualizados"
 
-#: dselect/pkgdisplay.cc:108
+#: dselect/pkgdisplay.cc
 msgid "Removed and no longer available packages"
 msgstr "Pacotes removidos e que já não estão disponíveis"
 
-#: dselect/pkgdisplay.cc:112
-msgid "Installed packages"
-msgstr "Pacotes instalados"
-
-#: dselect/pkgdisplay.cc:113
+#: dselect/pkgdisplay.cc
 msgid "Removed packages (configuration still present)"
 msgstr "Pacotes removidos (configuração ainda presente)"
 
-#: dselect/pkgdisplay.cc:114
+#: dselect/pkgdisplay.cc
 msgid "Purged packages and those never installed"
 msgstr "Pacotes purgados e os que nunca foram instalados"
 
-#: dselect/pkgdisplay.cc:116
-msgid "Installed"
-msgstr "Instalado"
-
-#: dselect/pkgdisplay.cc:118
+#: dselect/pkgdisplay.cc
 msgid "Purged"
 msgstr "Purgado"
 
-#: dselect/pkgdisplay.cc:138
+#: dselect/pkgdisplay.cc
 msgid "Error"
 msgstr "Erro"
 
-#: dselect/pkgdisplay.cc:139
+#: dselect/pkgdisplay.cc
 msgid "Installed?"
 msgstr "Instalado?"
 
-#: dselect/pkgdisplay.cc:140
+#: dselect/pkgdisplay.cc
 msgid "Old mark"
 msgstr "Marca antiga"
 
-#: dselect/pkgdisplay.cc:141
+#: dselect/pkgdisplay.cc
 msgid "Marked for"
 msgstr "Marcado para"
 
-#: dselect/pkgdisplay.cc:143
+#: dselect/pkgdisplay.cc
 msgid "EIOM"
 msgstr "EIOM"
 
-#: dselect/pkgdisplay.cc:147 dselect/pkgdisplay.cc:150
+#: dselect/pkgdisplay.cc
 msgid "Section"
 msgstr "Secção"
 
-#: dselect/pkgdisplay.cc:148
+#: dselect/pkgdisplay.cc
 msgid "Priority"
 msgstr "Prioridade"
 
-#: dselect/pkgdisplay.cc:152
+#: dselect/pkgdisplay.cc
 msgid "Package"
 msgstr "Pacote"
 
-#: dselect/pkgdisplay.cc:161 dselect/pkgdisplay.cc:165
+#: dselect/pkgdisplay.cc
 msgid "Avail.arch"
 msgstr "arch.Dispon"
 
-#: dselect/pkgdisplay.cc:164
+#: dselect/pkgdisplay.cc
 msgid "Inst.arch"
 msgstr "arch.Inst"
 
-#: dselect/pkgdisplay.cc:178 dselect/pkgdisplay.cc:182
+#: dselect/pkgdisplay.cc
 msgid "Avail.ver"
 msgstr "Ver.Dispon."
 
-#: dselect/pkgdisplay.cc:181
+#: dselect/pkgdisplay.cc
 msgid "Inst.ver"
 msgstr "Vers.Inst"
 
-#: dselect/pkgdisplay.cc:197
+#: dselect/pkgdisplay.cc
 msgid "dselect - recursive package listing"
 msgstr "dselect - listagem recursiva de pacotes"
 
-#: dselect/pkgdisplay.cc:199
+#: dselect/pkgdisplay.cc
 msgid "dselect - inspection of package states"
 msgstr "dselect - inspecção de estado dos pacotes"
 
-#: dselect/pkgdisplay.cc:200
+#: dselect/pkgdisplay.cc
 msgid "dselect - main package listing"
 msgstr "dselect - lista principal de pacotes"
 
-#: dselect/pkgdisplay.cc:208
+#: dselect/pkgdisplay.cc
 msgid " (by section)"
 msgstr " (por secção)"
 
-#: dselect/pkgdisplay.cc:211
+#: dselect/pkgdisplay.cc
 msgid " (avail., section)"
 msgstr " (disp., secção)"
 
-#: dselect/pkgdisplay.cc:214
+#: dselect/pkgdisplay.cc
 msgid " (status, section)"
 msgstr " (status, secção)"
 
-#: dselect/pkgdisplay.cc:223
+#: dselect/pkgdisplay.cc
 msgid " (by priority)"
 msgstr "(por prioridade)"
 
-#: dselect/pkgdisplay.cc:226
+#: dselect/pkgdisplay.cc
 msgid " (avail., priority)"
 msgstr " (disp., proioridade)"
 
-#: dselect/pkgdisplay.cc:229
+#: dselect/pkgdisplay.cc
 msgid " (status, priority)"
 msgstr " (status, prioridade)"
 
-#: dselect/pkgdisplay.cc:238
+#: dselect/pkgdisplay.cc
 msgid " (alphabetically)"
 msgstr " (alfabeticamente)"
 
-#: dselect/pkgdisplay.cc:241
+#: dselect/pkgdisplay.cc
 msgid " (by availability)"
 msgstr " (por disponibilidade)"
 
-#: dselect/pkgdisplay.cc:244
+#: dselect/pkgdisplay.cc
 msgid " (by status)"
 msgstr " (por status)"
 
-#: dselect/pkgdisplay.cc:259
+#: dselect/pkgdisplay.cc
 msgid " mark:+/=/- terse:v help:?"
 msgstr " marca:+/=/- resumo:v ajuda:?"
 
-#: dselect/pkgdisplay.cc:260
+#: dselect/pkgdisplay.cc
 msgid " mark:+/=/- verbose:v help:?"
 msgstr " marca:+/=/- detalhe:v ajuda:?"
 
-#: dselect/pkgdisplay.cc:262
+#: dselect/pkgdisplay.cc
 msgid " terse:v help:?"
 msgstr " detalhe:v ajuda:?"
 
-#: dselect/pkgdisplay.cc:263
+#: dselect/pkgdisplay.cc
 msgid " verbose:v help:?"
 msgstr " detalhe:v ajuda:?"
 
-#: dselect/pkginfo.cc:85
+#: dselect/pkginfo.cc
 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 "
@@ -1573,80 +1602,110 @@ msgstr ""
 "Pode utilizar 'o' e 'O' para modificar a ordenação e dar a você prório a "
 "oportunidade de marcar pacotes em diferentes tipos de grupos."
 
-#: dselect/pkginfo.cc:98
+#: dselect/pkginfo.cc
 msgid "Interrelationships"
 msgstr "Interrelacionamentos"
 
-#: dselect/pkginfo.cc:117
+#: dselect/pkginfo.cc
 msgid "No description available."
 msgstr "Sem descrição disponível"
 
-#: dselect/pkginfo.cc:135
+#: dselect/pkginfo.cc
 msgid "Installed control file information"
 msgstr "Informação do ficheiro controle de 'Installed'"
 
-#: dselect/pkginfo.cc:151
+#: dselect/pkginfo.cc
 msgid "Available control file information"
 msgstr "informação 'Available' do ficheiro de controle"
 
-#: dselect/pkglist.cc:425
+#: dselect/pkglist.cc
 msgid "there are no packages"
 msgstr "Não existem pacotes"
 
-#: dselect/pkglist.cc:521
+#: dselect/pkglist.cc
 msgid "invalid search option given"
 msgstr "fornecida opção de busca inválida"
 
-#: dselect/pkglist.cc:536
+#: dselect/pkglist.cc
 msgid "error in regular expression"
 msgstr "erro em expressão regular"
 
-#: dselect/pkgsublist.cc:111
+#: dselect/pkgsublist.cc
 msgid " does not appear to be available\n"
 msgstr " não parece estar disponível\n"
 
-#: dselect/pkgsublist.cc:131
+#: dselect/pkgsublist.cc
 msgid " or "
 msgstr " ou "
 
-#: dselect/pkgtop.cc:58
+#: dselect/pkgtop.cc
 msgid "All"
 msgstr "Todos"
 
-#: dselect/pkgtop.cc:80
+#: dselect/pkgtop.cc
 msgid "All packages"
 msgstr "Todos os pacotes"
 
-#: dselect/pkgtop.cc:84
+#: dselect/pkgtop.cc
 #, c-format
 msgid "%s packages without a section"
 msgstr "%s pacotes sem secção"
 
-#: dselect/pkgtop.cc:86
+#: dselect/pkgtop.cc
 #, c-format
 msgid "%s packages in section %s"
 msgstr "%s pacotes na secção %s"
 
-#: dselect/pkgtop.cc:92
+#: dselect/pkgtop.cc
 #, c-format
 msgid "%s %s packages"
 msgstr "%s %s pacotes"
 
-#: dselect/pkgtop.cc:96
+#: dselect/pkgtop.cc
 #, c-format
 msgid "%s %s packages without a section"
 msgstr "%s %s pacotes sem secção"
 
-#: dselect/pkgtop.cc:98
+#: dselect/pkgtop.cc
 #, c-format
 msgid "%s %s packages in section %s"
 msgstr "%s %s pacotes na secção %s"
 
-#: dselect/pkgtop.cc:119
+#: dselect/pkgtop.cc
 #, c-format
 msgid "%-*s %s%s%s;  %s (was: %s).  %s"
 msgstr "%-*s %s%s%s;  %s (foi: %s).  %s"
 
+#~ msgid "Actions:\n"
+#~ msgstr "Acções:\n"
+
+#~ msgid "Colours:\n"
+#~ msgstr "Cores:\n"
+
+#~ msgid "Attributes:\n"
+#~ msgstr "Atributos:\n"
+
+#~ msgid "EOF before option name start"
+#~ msgstr "EOF antes de começar nome de opção"
+
+#~ msgid "EOF before summary"
+#~ msgstr "EOF antes do sumário"
+
+#~ msgid "!Bug!"
+#~ msgstr "!Bug!"
+
+#~ msgid "Updated"
+#~ msgstr "Actualizado"
+
+#~ msgid "Up-to-date"
+#~ msgstr "Actualizados"
+
+#~ msgid "Updated packages (newer version is available)"
+#~ msgstr "Pacotes actualizados (está disponível versão mais recente)"
+
+#~ msgid "Available packages (not currently installed)"
+#~ msgstr "Pacotes disponíveis (não instalados actualmente)"
+
 #~ msgid ""
 #~ "Actions:\n"
 #~ "  access update select install config remove quit\n"
diff --git a/dselect/po/pt_BR.po b/dselect/po/pt_BR.po
index 7e61e4a73..88a1c0f96 100644
--- a/dselect/po/pt_BR.po
+++ b/dselect/po/pt_BR.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dselect 1.13\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2014-12-23 18:12+0100\n"
+"POT-Creation-Date: 2015-04-06 09:37+0200\n"
 "PO-Revision-Date: 2008-06-09 02:53-0300\n"
 "Last-Translator: Felipe Augusto van de Wiel <faw@debian.org>\n"
 "Language-Team: Brazilian Portuguese <debian-l10n-portuguese@lists.debian."
@@ -21,29 +21,29 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: dselect/basecmds.cc:125
+#: dselect/basecmds.cc
 msgid "Search for ? "
 msgstr "Procurar por? "
 
-#: dselect/basecmds.cc:149
+#: dselect/basecmds.cc
 msgid "Error: "
 msgstr "Erro: "
 
-#: dselect/basecmds.cc:180
+#: dselect/basecmds.cc
 msgid "Help: "
 msgstr "Ajuda: "
 
-#: dselect/basecmds.cc:186
+#: dselect/basecmds.cc
 msgid "Press ? for help menu, . for next topic, <space> to exit help."
 msgstr ""
 "Pressione ? para o menu de ajuda, . para o próximo tópico, <espaço> para "
 "sair da ajuda."
 
-#: dselect/basecmds.cc:193
+#: dselect/basecmds.cc
 msgid "Help information is available under the following topics:"
 msgstr "Informações de ajuda estão disponíveis nos seguintes tópicos:"
 
-#: dselect/basecmds.cc:201
+#: dselect/basecmds.cc
 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. "
@@ -52,241 +52,241 @@ msgstr ""
 "  sair da ajuda, ou '.' (ponto final) para ler uma página de\n"
 "  ajuda por vez. "
 
-#: dselect/basecmds.cc:207
+#: dselect/basecmds.cc
 msgid "error reading keyboard in help"
 msgstr "erro lendo teclado na ajuda"
 
-#: dselect/baselist.cc:60
+#: dselect/baselist.cc
 msgid "ioctl(TIOCGWINSZ) failed"
 msgstr "ioctl(TIOCGWINSZ) falhou"
 
-#: dselect/baselist.cc:63
+#: dselect/baselist.cc
 msgid "doupdate in SIGWINCH handler failed"
 msgstr "doupdate no handler SIGWINCH falhou"
 
-#: dselect/baselist.cc:72
+#: dselect/baselist.cc
 msgid "failed to restore old SIGWINCH sigact"
 msgstr "falhou ao restaurar antigo sigact SIGWINCH"
 
-#: dselect/baselist.cc:75
+#: dselect/baselist.cc
 msgid "failed to restore old signal mask"
 msgstr "falhou ao restaurar antiga máscara de sinal"
 
-#: dselect/baselist.cc:86
+#: dselect/baselist.cc
 msgid "failed to get old signal mask"
 msgstr "falhou ao obter antiga máscara de sinal"
 
-#: dselect/baselist.cc:88
+#: dselect/baselist.cc
 msgid "failed to get old SIGWINCH sigact"
 msgstr "falhou ao obter antiga sigact SIGWINCH"
 
-#: dselect/baselist.cc:93
+#: dselect/baselist.cc
 msgid "failed to block SIGWINCH"
 msgstr "falhou ao bloquear SIGWINCH"
 
-#: dselect/baselist.cc:99
+#: dselect/baselist.cc
 msgid "failed to set new SIGWINCH sigact"
 msgstr "falhou ao definir novo sigact SIGWINCH"
 
-#: dselect/baselist.cc:174
+#: dselect/baselist.cc
 msgid "failed to allocate colour pair"
 msgstr "falhou ao alocar par de cores"
 
-#: dselect/baselist.cc:203
+#: dselect/baselist.cc
 msgid "failed to create title window"
 msgstr "falhou ao criar título da janela"
 
-#: dselect/baselist.cc:207
+#: dselect/baselist.cc
 msgid "failed to create whatinfo window"
 msgstr "falhou ao criar janela \"whatinfo\""
 
-#: dselect/baselist.cc:211
+#: dselect/baselist.cc
 msgid "failed to create baselist pad"
 msgstr "falhou ao criar \"baselist pad\""
 
-#: dselect/baselist.cc:214
+#: dselect/baselist.cc
 msgid "failed to create heading pad"
 msgstr "falhou ao criar \"heading pad\""
 
-#: dselect/baselist.cc:218
+#: dselect/baselist.cc
 msgid "failed to create thisstate pad"
 msgstr "falhou ao criar \"thisstate pad\""
 
-#: dselect/baselist.cc:222
+#: dselect/baselist.cc
 msgid "failed to create info pad"
 msgstr "falhou ao criar \"info pad\""
 
-#: dselect/baselist.cc:227
+#: dselect/baselist.cc
 msgid "failed to create query window"
 msgstr "falhou ao criar janela de consulta"
 
-#: dselect/baselist.cc:298
+#: dselect/baselist.cc
 msgid "Keybindings"
 msgstr "Associações de teclas"
 
-#: dselect/baselist.cc:347
+#: dselect/baselist.cc
 #, c-format
 msgid "  -- %d%%, press "
 msgstr "  -- %d%%, pressione "
 
-#: dselect/baselist.cc:350
+#: dselect/baselist.cc
 #, c-format
 msgid "%s for more"
 msgstr "%s para mais"
 
-#: dselect/baselist.cc:354
+#: dselect/baselist.cc
 #, c-format
 msgid "%s to go back"
 msgstr "%s para voltar"
 
-#: dselect/bindings.cc:78
+#: dselect/bindings.cc
 msgid "[not bound]"
 msgstr "[não atribuído]"
 
-#: dselect/bindings.cc:82
+#: dselect/bindings.cc
 #, c-format
 msgid "[unk: %d]"
 msgstr "[des: %d]"
 
-#: dselect/bindings.cc:141
+#: dselect/bindings.cc
 msgid "Scroll onwards through help/information"
 msgstr "Rolagem progressiva através da ajuda/informação"
 
-#: dselect/bindings.cc:142
+#: dselect/bindings.cc
 msgid "Scroll backwards through help/information"
 msgstr "Rolagem regressiva através da ajuda/informação"
 
-#: dselect/bindings.cc:143
+#: dselect/bindings.cc
 msgid "Move up"
 msgstr "Mover para acima"
 
-#: dselect/bindings.cc:144
+#: dselect/bindings.cc
 msgid "Move down"
 msgstr "Mover para abaixo"
 
-#: dselect/bindings.cc:145
+#: dselect/bindings.cc
 msgid "Go to top of list"
 msgstr "Ir ao topo da lista"
 
-#: dselect/bindings.cc:146
+#: dselect/bindings.cc
 msgid "Go to end of list"
 msgstr "Ir ao fim da lista"
 
-#: dselect/bindings.cc:147
+#: dselect/bindings.cc
 msgid "Request help (cycle through help screens)"
 msgstr "Solicitar ajuda (percorrer as telas de ajuda)"
 
-#: dselect/bindings.cc:148
+#: dselect/bindings.cc
 msgid "Cycle through information displays"
 msgstr "Percorrer as telas de informações"
 
-#: dselect/bindings.cc:149
+#: dselect/bindings.cc
 msgid "Redraw display"
 msgstr "Redesenhar a tela"
 
-#: dselect/bindings.cc:150
+#: dselect/bindings.cc
 msgid "Scroll onwards through list by 1 line"
 msgstr "Rolagem progressiva de 1 linha através lista"
 
-#: dselect/bindings.cc:151
+#: dselect/bindings.cc
 msgid "Scroll backwards through list by 1 line"
 msgstr "Rolagem regressiva de 1 linha através da lista"
 
-#: dselect/bindings.cc:152
+#: dselect/bindings.cc
 msgid "Scroll onwards through help/information by 1 line"
 msgstr "Rolagem progressiva de 1 linha através da ajuda/informação"
 
-#: dselect/bindings.cc:153
+#: dselect/bindings.cc
 msgid "Scroll backwards through help/information by 1 line"
 msgstr "Rolagem regressiva de 1 linha através da ajuda/informação"
 
-#: dselect/bindings.cc:154
+#: dselect/bindings.cc
 msgid "Scroll onwards through list"
 msgstr "Rolagem progressiva através da lista"
 
-#: dselect/bindings.cc:155
+#: dselect/bindings.cc
 msgid "Scroll backwards through list"
 msgstr "Rolagem regressiva através da lista"
 
-#: dselect/bindings.cc:158
+#: dselect/bindings.cc
 msgid "Mark package(s) for installation"
 msgstr "Marcar pacote(s) para instalação"
 
-#: dselect/bindings.cc:159
+#: dselect/bindings.cc
 msgid "Mark package(s) for deinstallation"
 msgstr "Marcar pacote(s) para desinstalação"
 
-#: dselect/bindings.cc:160
+#: dselect/bindings.cc
 msgid "Mark package(s) for deinstall and purge"
 msgstr "Marcar pacote(s) para desinstalação e expurgamento"
 
-#: dselect/bindings.cc:161
+#: dselect/bindings.cc
 msgid "Make highlight more specific"
 msgstr "Fazer realce mais específico"
 
-#: dselect/bindings.cc:162
+#: dselect/bindings.cc
 msgid "Make highlight less specific"
 msgstr "Fazer realce menos específico"
 
-#: dselect/bindings.cc:163
+#: dselect/bindings.cc
 msgid "Search for a package whose name contains a string"
 msgstr "Procurar por um pacote cujo nome contém uma string"
 
-#: dselect/bindings.cc:164
+#: dselect/bindings.cc
 #, fuzzy
 #| msgid "Repeat last search."
 msgid "Repeat last search"
 msgstr "Repetir última busca."
 
-#: dselect/bindings.cc:165
+#: dselect/bindings.cc
 msgid "Swap sort order priority/section"
 msgstr "Trocar ordenação de prioridade/seção"
 
-#: dselect/bindings.cc:166
+#: dselect/bindings.cc
 msgid "Quit, confirming, and checking dependencies"
 msgstr "Sair, confirmando, e checando dependências"
 
-#: dselect/bindings.cc:167
+#: dselect/bindings.cc
 msgid "Quit, confirming without check"
 msgstr "Sair, confirmando sem checar"
 
-#: dselect/bindings.cc:168
+#: dselect/bindings.cc
 msgid "Quit, rejecting conflict/dependency suggestions"
 msgstr "Sair, rejeitando sugestões de conflitos/dependências"
 
-#: dselect/bindings.cc:169
+#: dselect/bindings.cc
 msgid "Abort - quit without making changes"
 msgstr "Abortar - sair sem fazer mudanças"
 
-#: dselect/bindings.cc:170
+#: dselect/bindings.cc
 msgid "Revert to old state for all packages"
 msgstr "Reverter ao estado antigo em todos os pacotes"
 
-#: dselect/bindings.cc:171
+#: dselect/bindings.cc
 msgid "Revert to suggested state for all packages"
 msgstr "Reverter ao estado sugerido em todos os pacotes"
 
-#: dselect/bindings.cc:172
+#: dselect/bindings.cc
 msgid "Revert to directly requested state for all packages"
 msgstr "Reverter ao estado diretamente requisitado em todos os pacotes"
 
-#: dselect/bindings.cc:173
+#: dselect/bindings.cc
 msgid "Revert to currently installed state for all packages"
 msgstr "Reverter ao estado atualmente instalado em todos os pacotes"
 
-#: dselect/bindings.cc:176
+#: dselect/bindings.cc
 msgid "Select currently-highlighted access method"
 msgstr "Selecionar método de acesso em destaque"
 
-#: dselect/bindings.cc:177
+#: dselect/bindings.cc
 msgid "Quit without changing selected access method"
 msgstr "Sair sem mudar método de acesso selecionado"
 
-#: dselect/helpmsgs.cc:29
+#: dselect/helpmsgs.cc
 msgid "Keystrokes"
 msgstr "Teclas de atalho"
 
-#: dselect/helpmsgs.cc:29
+#: dselect/helpmsgs.cc
 #, fuzzy
 #| msgid ""
 #| "Motion keys: Next/Previous, Top/End, Up/Down, Backwards/Forwards:\n"
@@ -383,11 +383,11 @@ msgstr ""
 "   D     configurar tudo para o estado\n"
 "         estado Diretamente requisitado       n, \\  repetir última busca\n"
 
-#: dselect/helpmsgs.cc:55
+#: dselect/helpmsgs.cc
 msgid "Introduction to package selections"
 msgstr "Introdução às seleções de pacotes"
 
-#: dselect/helpmsgs.cc:55
+#: dselect/helpmsgs.cc
 msgid ""
 "Welcome to dselect's main package listing.\n"
 "\n"
@@ -444,11 +444,11 @@ msgstr ""
 "\n"
 "Pressione <espaço> para sair da ajuda e entrar na lista agora.\n"
 
-#: dselect/helpmsgs.cc:80
+#: dselect/helpmsgs.cc
 msgid "Introduction to read-only package list browser"
 msgstr "Introdução ao navegador da lista de pacotes somente-leitura"
 
-#: dselect/helpmsgs.cc:80
+#: dselect/helpmsgs.cc
 msgid ""
 "Welcome to dselect's main package listing.\n"
 "\n"
@@ -486,11 +486,11 @@ msgstr ""
 "\n"
 "Pressione <espaço> para sair da ajuda e entrar na lista agora.\n"
 
-#: dselect/helpmsgs.cc:99
+#: dselect/helpmsgs.cc
 msgid "Introduction to conflict/dependency resolution sub-list"
 msgstr "Introdução à sub-lista de resolução de conflitos/dependências"
 
-#: dselect/helpmsgs.cc:99
+#: dselect/helpmsgs.cc
 msgid ""
 "Dependency/conflict resolution - introduction.\n"
 "\n"
@@ -557,11 +557,11 @@ msgstr ""
 "Pressione <espaço> para sair da ajuda e entrar na sub-lista; lembre-se:\n"
 "pressione '?' para ajuda.\n"
 
-#: dselect/helpmsgs.cc:125
+#: dselect/helpmsgs.cc
 msgid "Display, part 1: package listing and status chars"
 msgstr "Tela, parte 1: lista de pacotes e caracteres de estado"
 
-#: dselect/helpmsgs.cc:125
+#: dselect/helpmsgs.cc
 msgid ""
 "The top half of the screen shows a list of packages.  For each package you "
 "see\n"
@@ -628,11 +628,11 @@ msgstr ""
 "instalada e disponíveis de cada pacote (shift-V para exiber/ocultar)\n"
 "e descrição resumida.\n"
 
-#: dselect/helpmsgs.cc:152
+#: dselect/helpmsgs.cc
 msgid "Display, part 2: list highlight; information display"
 msgstr "Tela, parte 2: realces na lista; tela de informação"
 
-#: dselect/helpmsgs.cc:152
+#: dselect/helpmsgs.cc
 msgid ""
 "* Highlight: One line in the package list will be highlighted.  It "
 "indicates\n"
@@ -680,11 +680,11 @@ msgstr ""
 "  Use a tecla 'i' para circular pelas telas, e 'I' para ocultar a tela de\n"
 "  informações ou expandí-la por quase toda a tela.\n"
 
-#: dselect/helpmsgs.cc:176
+#: dselect/helpmsgs.cc
 msgid "Introduction to method selection display"
 msgstr "Introdução à tela de seleção de métodos"
 
-#: dselect/helpmsgs.cc:176
+#: dselect/helpmsgs.cc
 msgid ""
 "dselect and dpkg can do automatic installation, loading the package files to "
 "be\n"
@@ -725,11 +725,11 @@ msgstr ""
 "Uma lista completa de teclas de atalho está disponível pressionando 'k'\n"
 "agora, ou no menu de ajuda acessível pressionando '?'.\n"
 
-#: dselect/helpmsgs.cc:196
+#: dselect/helpmsgs.cc
 msgid "Keystrokes for method selection"
 msgstr "Teclas para seleção de método"
 
-#: dselect/helpmsgs.cc:196
+#: dselect/helpmsgs.cc
 msgid ""
 "Motion keys: Next/Previous, Top/End, Up/Down, Backwards/Forwards:\n"
 "  j, Down-arrow         k, Up-arrow             move highlight\n"
@@ -776,104 +776,104 @@ msgstr ""
 "  /                procura (enter para cancelar)\n"
 "  \\                repetir última busca\n"
 
-#: dselect/main.cc:63
+#: dselect/main.cc
 msgid "Type dselect --help for help."
 msgstr "Digite dselect --help para ajuda."
 
-#: dselect/main.cc:145
+#: dselect/main.cc
 msgid "a"
 msgstr "a"
 
-#: dselect/main.cc:145
+#: dselect/main.cc
 msgid "[A]ccess"
 msgstr "[A]cesso"
 
-#: dselect/main.cc:145
+#: dselect/main.cc
 msgid "Choose the access method to use."
 msgstr "Escolher o método de acesso a usar."
 
-#: dselect/main.cc:146
+#: dselect/main.cc
 msgid "u"
 msgstr "u"
 
-#: dselect/main.cc:146
+#: dselect/main.cc
 msgid "[U]pdate"
 msgstr "[U]pdate"
 
-#: dselect/main.cc:146
+#: dselect/main.cc
 msgid "Update list of available packages, if possible."
 msgstr "Atualizar lista de pacotes disponíveis, se possível."
 
-#: dselect/main.cc:147
+#: dselect/main.cc
 msgid "s"
 msgstr "s"
 
-#: dselect/main.cc:147
+#: dselect/main.cc
 msgid "[S]elect"
 msgstr "[S]elecionar"
 
-#: dselect/main.cc:147
+#: dselect/main.cc
 msgid "Request which packages you want on your system."
 msgstr "Solicita quais pacotes você quer em seu sistema."
 
-#: dselect/main.cc:148
+#: dselect/main.cc
 msgid "i"
 msgstr "i"
 
-#: dselect/main.cc:148
+#: dselect/main.cc
 msgid "[I]nstall"
 msgstr "[I]nstalar"
 
-#: dselect/main.cc:148
+#: dselect/main.cc
 msgid "Install and upgrade wanted packages."
 msgstr "Instalar e atualizar pacotes desejados."
 
-#: dselect/main.cc:149
+#: dselect/main.cc
 msgid "c"
 msgstr "c"
 
-#: dselect/main.cc:149
+#: dselect/main.cc
 msgid "[C]onfig"
 msgstr "[C]onfigurar"
 
-#: dselect/main.cc:149
+#: dselect/main.cc
 msgid "Configure any packages that are unconfigured."
 msgstr "Configurar quaisquer pacotes que estejam desconfigurados."
 
-#: dselect/main.cc:150
+#: dselect/main.cc
 msgid "r"
 msgstr "r"
 
-#: dselect/main.cc:150
+#: dselect/main.cc
 msgid "[R]emove"
 msgstr "[R]emover"
 
-#: dselect/main.cc:150
+#: dselect/main.cc
 msgid "Remove unwanted software."
 msgstr "Remover programas indesejados."
 
-#: dselect/main.cc:151
+#: dselect/main.cc
 msgid "q"
 msgstr "q"
 
-#: dselect/main.cc:151
+#: dselect/main.cc
 msgid "[Q]uit"
 msgstr "[Q]Sair"
 
-#: dselect/main.cc:151
+#: dselect/main.cc
 msgid "Quit dselect."
 msgstr "Sair do dselect."
 
-#: dselect/main.cc:152
+#: dselect/main.cc
 msgid "menu"
 msgstr "menu"
 
-#: dselect/main.cc:157
+#: dselect/main.cc
 #, c-format
 msgid "Debian `%s' package handling frontend version %s.\n"
 msgstr "Interface do gerenciador de pacotes do Debian '%s' versão %s.\n"
 
-#: dselect/main.cc:160
+#: dselect/main.cc
 #, fuzzy
 msgid ""
 "This is free software; see the GNU General Public License version 2 or\n"
@@ -884,20 +884,28 @@ msgstr ""
 "NENHUMA garantia.\n"
 "Veja %s --license para detalhes de copyright e licença.\n"
 
-#: dselect/main.cc:169 dselect/main.cc:217
+#: dselect/main.cc
 msgid "<standard output>"
 msgstr ""
 
-#: dselect/main.cc:180
-#, c-format
+#: dselect/main.cc
+#, fuzzy, c-format
+#| msgid ""
+#| "Usage: %s [<option> ...] [<action> ...]\n"
+#| "\n"
 msgid ""
-"Usage: %s [<option> ...] [<action> ...]\n"
+"Usage: %s [<option>...] [<command>...]\n"
 "\n"
 msgstr ""
 "Uso: %s [<opções> ...] [<ação> ...]\n"
 "\n"
 
-#: dselect/main.cc:184
+#: dselect/main.cc
+#, c-format
+msgid "Commands:\n"
+msgstr ""
+
+#: dselect/main.cc
 #, fuzzy, c-format
 #| msgid ""
 #| "Options:\n"
@@ -911,12 +919,12 @@ msgstr ""
 #| "\n"
 msgid ""
 "Options:\n"
-"  --admindir <directory>     Use <directory> instead of %s.\n"
-"  --expert                   Turn on expert mode.\n"
-"  --debug <file> | -D<file>  Turn on debugging, sending output to <file>.\n"
-"  --colour | --color screenpart:[foreground],[background][:attr[+attr+...]]\n"
-"                             Configure screen colours.\n"
-"\n"
+"      --admindir <directory>       Use <directory> instead of %s.\n"
+"      --expert                     Turn on expert mode.\n"
+"  -D, --debug <file>               Turn on debugging, send output to "
+"<file>.\n"
+"      --color <color-spec>         Configure screen colors.\n"
+"      --colour <color-spec>        Ditto.\n"
 msgstr ""
 "Opções:\n"
 "  --admindir <diretório>     Use <diretório> ao invés de %s.\n"
@@ -926,11 +934,11 @@ msgstr ""
 "                             Configura cores da tela.\n"
 "\n"
 
-#: dselect/main.cc:193
+#: dselect/main.cc
 #, fuzzy, c-format
 msgid ""
-"  --help                     Show this help message.\n"
-"  --version                  Show the version.\n"
+"  -?, --help                       Show this help message.\n"
+"      --version                    Show the version.\n"
 "\n"
 msgstr ""
 "  --help                     Mostra esta mensagem de ajuda.\n"
@@ -938,65 +946,67 @@ msgstr ""
 "  --license | --licence      Mostra a licença.\n"
 "\n"
 
-#: dselect/main.cc:197
-#, fuzzy, c-format
-#| msgid "Section"
-msgid "Actions:\n"
-msgstr "Seção"
-
-#: dselect/main.cc:202
+#: dselect/main.cc
 #, c-format
-msgid "Screenparts:\n"
+msgid ""
+"<color-spec> is <screen-part>:[<foreground>],[<background>][:"
+"<attr>[+<attr>]...]\n"
+msgstr ""
+
+#: dselect/main.cc
+#, fuzzy, c-format
+#| msgid "Screenparts:\n"
+msgid "<screen-part> is:"
 msgstr "Partes da tela:\n"
 
-#: dselect/main.cc:207
+#: dselect/main.cc
 #, c-format
-msgid "Colours:\n"
-msgstr "Cores:\n"
+msgid "<color> is:"
+msgstr ""
 
-#: dselect/main.cc:212
+#: dselect/main.cc
 #, c-format
-msgid "Attributes:\n"
-msgstr "Atributos:\n"
+msgid "<attr> is:"
+msgstr ""
 
-#: dselect/main.cc:232
+#: dselect/main.cc
 #, c-format
 msgid "couldn't open debug file `%.255s'\n"
 msgstr "não foi possível abrir arquivo de depuração '%.250s'\n"
 
-#: dselect/main.cc:253
+#: dselect/main.cc
 #, fuzzy, c-format
 #| msgid "Invalid %s `%s'\n"
 msgid "invalid %s '%s'"
 msgstr "%s inválido '%s'\n"
 
-#: dselect/main.cc:272
+#: dselect/main.cc
 msgid "screen part"
 msgstr "parte da tela"
 
-#: dselect/main.cc:278
+#: dselect/main.cc
 #, fuzzy
 #| msgid "Null colour specification\n"
 msgid "null colour specification"
 msgstr "Especificação de cor nula\n"
 
-#: dselect/main.cc:286 dselect/main.cc:291
+#: dselect/main.cc
 msgid "colour"
 msgstr "cor"
 
-#: dselect/main.cc:299
+#: dselect/main.cc
 msgid "colour attribute"
 msgstr "atributo cor"
 
-#: dselect/main.cc:333
+#: dselect/main.cc
 msgid "Terminal does not appear to support cursor addressing.\n"
 msgstr "Terminal não parece dar suporte ao endereçamento de cursor.\n"
 
-#: dselect/main.cc:335
+#: dselect/main.cc
 msgid "Terminal does not appear to support highlighting.\n"
 msgstr "Terminal não parece dar suporte ao realce (\"highlighting\").\n"
 
-#: dselect/main.cc:337
+#: dselect/main.cc
 #, c-format
 msgid ""
 "Set your TERM variable correctly, use a better terminal,\n"
@@ -1005,11 +1015,11 @@ msgstr ""
 "Defina sua variável TERM corretamente, use um terminal melhor,\n"
 "ou faça com a ferramenta de gerenciamento por-pacote %s.\n"
 
-#: dselect/main.cc:340
+#: dselect/main.cc
 msgid "terminal lacks necessary features, giving up"
 msgstr "terminal não possui alguns recursos necessários, desistindo"
 
-#: dselect/main.cc:425
+#: dselect/main.cc
 msgid ""
 "\n"
 "\n"
@@ -1022,7 +1032,7 @@ msgstr ""
 "Mova-se com ^P e ^N, teclas direcionais, letras iniciais, ou dígitos;\n"
 "Pressione <enter> para confirmar a seleção.   ^L redesenha a tela.\n"
 
-#: dselect/main.cc:430
+#: dselect/main.cc
 msgid ""
 "Copyright (C) 1994-1996 Ian Jackson.\n"
 "Copyright (C) 2000,2001 Wichert Akkerman.\n"
@@ -1030,7 +1040,7 @@ msgstr ""
 "Copyright (C) 1994-1996 Ian Jackson.\n"
 "Copyright (C) 2000,2001 Wichert Akkerman.\n"
 
-#: dselect/main.cc:436
+#: dselect/main.cc
 msgid ""
 "\n"
 "\n"
@@ -1041,57 +1051,57 @@ msgstr ""
 "Acesso somente-leitura: apenas a pré-visualização das seleções está "
 "disponível!"
 
-#: dselect/main.cc:455
+#: dselect/main.cc
 msgid "failed to getch in main menu"
 msgstr "falhou ao executar \"getch\" no menu principal"
 
-#: dselect/main.cc:538
+#: dselect/main.cc
 #, c-format
 msgid "unknown action string `%.50s'"
 msgstr "string de ação desconhecida '%.50s'"
 
-#: dselect/methlist.cc:66
+#: dselect/methlist.cc
 msgid "Abbrev."
 msgstr "Abrev."
 
-#: dselect/methlist.cc:67 dselect/pkgdisplay.cc:188 dselect/pkginfo.cc:110
+#: dselect/methlist.cc dselect/pkgdisplay.cc dselect/pkginfo.cc
 msgid "Description"
 msgstr "Descrição"
 
-#: dselect/methlist.cc:73
+#: dselect/methlist.cc
 msgid "dselect - list of access methods"
 msgstr "dselect - lista de métodos de acesso"
 
-#: dselect/methlist.cc:82
+#: dselect/methlist.cc
 #, c-format
 msgid "Access method `%s'."
 msgstr "Método de acesso '%s'."
 
-#: dselect/methlist.cc:161 dselect/pkglist.cc:587
+#: dselect/methlist.cc dselect/pkglist.cc
 msgid "doupdate failed"
 msgstr "doupdate falhou"
 
-#: dselect/methlist.cc:164 dselect/pkglist.cc:590
+#: dselect/methlist.cc dselect/pkglist.cc
 msgid "failed to unblock SIGWINCH"
 msgstr "falhou ao desbloquear SIGWINCH"
 
-#: dselect/methlist.cc:169 dselect/pkglist.cc:595
+#: dselect/methlist.cc dselect/pkglist.cc
 msgid "failed to re-block SIGWINCH"
 msgstr "falhou ao re-bloquear SIGWINCH"
 
-#: dselect/methlist.cc:170 dselect/pkglist.cc:597
+#: dselect/methlist.cc dselect/pkglist.cc
 msgid "getch failed"
 msgstr "\"getch\" falhou"
 
-#: dselect/methlist.cc:187
+#: dselect/methlist.cc
 msgid "Explanation"
 msgstr "Explicação de"
 
-#: dselect/methlist.cc:197
+#: dselect/methlist.cc
 msgid "No explanation available."
 msgstr "Sem explicação disponível"
 
-#: dselect/method.cc:67
+#: dselect/method.cc
 #, c-format
 msgid ""
 "\n"
@@ -1102,7 +1112,7 @@ msgstr ""
 "\n"
 "%s: %s\n"
 
-#: dselect/method.cc:70
+#: dselect/method.cc
 msgid ""
 "\n"
 "Press <enter> to continue."
@@ -1110,192 +1120,202 @@ msgstr ""
 "\n"
 "Pressione <enter> para continuar."
 
-#: dselect/method.cc:82
+#: dselect/method.cc
 msgid "cannot unlock access method area"
 msgstr ""
 
-#: dselect/method.cc:96
+#: dselect/method.cc
 #, fuzzy
 #| msgid " does not appear to be available\n"
 msgid "no access methods are available"
 msgstr " não parece estar disponível\n"
 
-#: dselect/method.cc:115
+#: dselect/method.cc
 msgid "requested operation requires superuser privilege"
 msgstr ""
 
-#: dselect/method.cc:118
+#: dselect/method.cc
 #, fuzzy
 #| msgid "Choose the access method to use."
 msgid "cannot open or create access method lockfile"
 msgstr "Escolher o método de acesso a usar."
 
-#: dselect/method.cc:125
+#: dselect/method.cc
 msgid "the access method area is already locked"
 msgstr ""
 
-#: dselect/method.cc:128
+#: dselect/method.cc
 #, fuzzy
 #| msgid "dselect - list of access methods"
 msgid "cannot lock access method area"
 msgstr "dselect - lista de métodos de acesso"
 
-#: dselect/method.cc:161
+#: dselect/method.cc
 #, c-format
 msgid "Press <enter> to continue.\n"
 msgstr "Pressione <enter> para continuar.\n"
 
-#: dselect/method.cc:162
+#: dselect/method.cc
 #, fuzzy
 msgid "<standard error>"
 msgstr "erro de escrita na saída de erros padrão"
 
-#: dselect/method.cc:165
+#: dselect/method.cc
 msgid "error reading acknowledgement of program failure message"
 msgstr "erro lendo reconhecimento da mensagem de falha do programa"
 
-#: dselect/method.cc:187
+#: dselect/method.cc
 msgid "no access method is selected or configured"
 msgstr ""
 
-#: dselect/method.cc:196
+#: dselect/method.cc
 msgid "update available list script"
 msgstr "script de atualização da lista de disponíveis"
 
-#: dselect/method.cc:200
+#: dselect/method.cc
 msgid "installation script"
 msgstr "script de instalação"
 
-#: dselect/method.cc:246
+#: dselect/method.cc
 msgid "query/setup script"
 msgstr "script de pesquisa/configuração"
 
-#: dselect/methparse.cc:53
+#: dselect/methparse.cc
 #, c-format
 msgid "syntax error in method options file `%.250s' -- %s"
 msgstr "erro de sintaxe no arquivo de opções de método '%.250s' -- %s"
 
-#: dselect/methparse.cc:59
+#: dselect/methparse.cc
 #, c-format
 msgid "error reading options file `%.250s'"
 msgstr "erro lendo arquivo de opções '%.250s'"
 
-#: dselect/methparse.cc:93
+#: dselect/methparse.cc
 #, c-format
 msgid "unable to read `%.250s' directory for reading methods"
 msgstr "impossível ler diretório '%.250s' para métodos de leitura"
 
-#: dselect/methparse.cc:109
+#: dselect/methparse.cc
 #, c-format
 msgid "method `%.250s' has name that is too long (%d > %d characters)"
 msgstr "método '%.250s' possui um nome muito longo (%d > %d caracteres)"
 
-#: dselect/methparse.cc:120
+#: dselect/methparse.cc
 #, c-format
 msgid "unable to access method script `%.250s'"
 msgstr "impossível acessar script de método '%.250s'"
 
-#: dselect/methparse.cc:126
+#: dselect/methparse.cc
 #, c-format
 msgid "unable to read method options file `%.250s'"
 msgstr "impossível ler arquivo de opções de método '%.250s'"
 
-#: dselect/methparse.cc:150
+#: dselect/methparse.cc
 msgid "non-digit where digit wanted"
 msgstr "não-dígito onde era necessário dígito"
 
-#: dselect/methparse.cc:153
-msgid "EOF in index string"
+#: dselect/methparse.cc
+#, fuzzy
+#| msgid "EOF in index string"
+msgid "end of file in index string"
 msgstr "EOF no índice da string"
 
-#: dselect/methparse.cc:156
+#: dselect/methparse.cc
 msgid "index string too long"
 msgstr "índice da string muito longo"
 
-#: dselect/methparse.cc:159
+#: dselect/methparse.cc
 msgid "newline before option name start"
 msgstr "nova linha antes do início do nome da opção"
 
-#: dselect/methparse.cc:161
-msgid "EOF before option name start"
-msgstr "EOF antes do início do nome da opção"
+#: dselect/methparse.cc
+#, fuzzy
+#| msgid "newline before option name start"
+msgid "end of file before option name start"
+msgstr "nova linha antes do início do nome da opção"
 
-#: dselect/methparse.cc:165
+#: dselect/methparse.cc
 msgid "nonalpha where option name start wanted"
 msgstr "não-alpha onde era necessário início do nome da opção"
 
-#: dselect/methparse.cc:167
+#: dselect/methparse.cc
 msgid "non-alphanum in option name"
 msgstr "não alfanumérico no nome da opção"
 
-#: dselect/methparse.cc:170
-msgid "EOF in option name"
+#: dselect/methparse.cc
+#, fuzzy
+#| msgid "EOF in option name"
+msgid "end of file in option name"
 msgstr "EOF no nome da opção"
 
-#: dselect/methparse.cc:175
+#: dselect/methparse.cc
 msgid "newline before summary"
 msgstr "nova linha antes do sumário"
 
-#: dselect/methparse.cc:177
-msgid "EOF before summary"
-msgstr "EOF antes do sumário"
+#: dselect/methparse.cc
+#, fuzzy
+#| msgid "newline before summary"
+msgid "end of file before summary"
+msgstr "nova linha antes do sumário"
 
-#: dselect/methparse.cc:183
-msgid "EOF in summary - missing newline"
+#: dselect/methparse.cc
+#, fuzzy
+#| msgid "EOF in summary - missing newline"
+msgid "end of file in summary - missing newline"
 msgstr "EOF no sumário - nova linha faltando"
 
-#: dselect/methparse.cc:193
+#: dselect/methparse.cc
 #, c-format
 msgid "unable to open option description file `%.250s'"
 msgstr "impossível abrir arquivo de descrição de opção '%.250s'"
 
-#: dselect/methparse.cc:197
+#: dselect/methparse.cc
 #, c-format
 msgid "unable to stat option description file `%.250s'"
 msgstr "impossível executar \"stat\" no arquivo de descrição de opção '%.250s'"
 
-#: dselect/methparse.cc:201
+#: dselect/methparse.cc
 #, c-format
 msgid "failed to read option description file `%.250s'"
 msgstr "falhou ao ler arquivo de descrição de opção '%.250s'"
 
-#: dselect/methparse.cc:204
+#: dselect/methparse.cc
 #, c-format
 msgid "error during read of option description file `%.250s'"
 msgstr "erro durante a leitura do arquivo de descrição de opção '%.250s'"
 
-#: dselect/methparse.cc:227
+#: dselect/methparse.cc
 #, c-format
 msgid "error during read of method options file `%.250s'"
 msgstr "erro durante a leitura do arquivo de opções de método '%.250s'"
 
-#: dselect/methparse.cc:250
+#: dselect/methparse.cc
 #, c-format
 msgid "unable to open current option file `%.250s'"
 msgstr "impossível abrir arquivo de opção atual '%.250s'"
 
-#: dselect/methparse.cc:286
+#: dselect/methparse.cc
 #, c-format
 msgid "unable to write new option to `%.250s'"
 msgstr "impossível escrever nova opção para '%.250s'"
 
-#: dselect/pkgdisplay.cc:36
+#: dselect/pkgdisplay.cc
 msgid "new package"
 msgstr "novo pacote"
 
-#: dselect/pkgdisplay.cc:37
+#: dselect/pkgdisplay.cc
 msgid "install"
 msgstr "instalar"
 
-#: dselect/pkgdisplay.cc:38
+#: dselect/pkgdisplay.cc
 msgid "hold"
 msgstr "reter"
 
-#: dselect/pkgdisplay.cc:39
+#: dselect/pkgdisplay.cc
 msgid "remove"
 msgstr "remover"
 
-#: dselect/pkgdisplay.cc:40
+#: dselect/pkgdisplay.cc
 msgid "purge"
 msgstr "expurgar"
 
@@ -1303,331 +1323,325 @@ msgstr "expurgar"
 #. * the empty string to store information about the translation. DO NOT
 #. * CHANGE THAT IN A TRANSLATION! The code really relies on that being
 #. * a single space.
-#: dselect/pkgdisplay.cc:47
+#: dselect/pkgdisplay.cc
 msgid " "
 msgstr " "
 
-#: dselect/pkgdisplay.cc:48
+#: dselect/pkgdisplay.cc
 msgid "REINSTALL"
 msgstr "REINSTALAR"
 
-#: dselect/pkgdisplay.cc:51
+#: dselect/pkgdisplay.cc
 msgid "not installed"
 msgstr "não instalado"
 
-#: dselect/pkgdisplay.cc:52
+#: dselect/pkgdisplay.cc
 msgid "removed (configs remain)"
 msgstr "removido (configurações permanecem)"
 
-#: dselect/pkgdisplay.cc:53
+#: dselect/pkgdisplay.cc
 msgid "half installed"
 msgstr "semi-instalado"
 
-#: dselect/pkgdisplay.cc:54
+#: dselect/pkgdisplay.cc
 msgid "unpacked (not set up)"
 msgstr "desempacotado (não configurado)"
 
-#: dselect/pkgdisplay.cc:55
+#: dselect/pkgdisplay.cc
 msgid "half configured (config failed)"
 msgstr ""
 
-#: dselect/pkgdisplay.cc:56
+#: dselect/pkgdisplay.cc
 msgid "awaiting trigger processing"
 msgstr "processamento de gatilhos em espera"
 
-#: dselect/pkgdisplay.cc:57
+#: dselect/pkgdisplay.cc
 msgid "triggered"
 msgstr "disparado"
 
-#: dselect/pkgdisplay.cc:58
+#: dselect/pkgdisplay.cc
 msgid "installed"
 msgstr "instalado"
 
-#: dselect/pkgdisplay.cc:61
+#: dselect/pkgdisplay.cc
 msgid "Required"
 msgstr "Requeridos"
 
-#: dselect/pkgdisplay.cc:62
+#: dselect/pkgdisplay.cc
 msgid "Important"
 msgstr "Importantes"
 
-#: dselect/pkgdisplay.cc:63
+#: dselect/pkgdisplay.cc
 msgid "Standard"
 msgstr "Padrões"
 
-#: dselect/pkgdisplay.cc:64
+#: dselect/pkgdisplay.cc
 msgid "Optional"
 msgstr "Opcionais"
 
-#: dselect/pkgdisplay.cc:65
+#: dselect/pkgdisplay.cc
 msgid "Extra"
 msgstr "Extras"
 
-#: dselect/pkgdisplay.cc:66
-msgid "!Bug!"
-msgstr "!Bug!"
-
-#: dselect/pkgdisplay.cc:67
+#: dselect/pkgdisplay.cc
 msgid "Unclassified"
 msgstr "Sem classificação"
 
-#: dselect/pkgdisplay.cc:70
+#: dselect/pkgdisplay.cc
 msgid "suggests"
 msgstr "sugere"
 
-#: dselect/pkgdisplay.cc:71
+#: dselect/pkgdisplay.cc
 msgid "recommends"
 msgstr "recomenda"
 
-#: dselect/pkgdisplay.cc:72
+#: dselect/pkgdisplay.cc
 msgid "depends on"
 msgstr "depende de"
 
-#: dselect/pkgdisplay.cc:73
+#: dselect/pkgdisplay.cc
 msgid "pre-depends on"
 msgstr "pré-depende de"
 
-#: dselect/pkgdisplay.cc:74
+#: dselect/pkgdisplay.cc
 msgid "breaks"
 msgstr "quebra"
 
-#: dselect/pkgdisplay.cc:75
+#: dselect/pkgdisplay.cc
 msgid "conflicts with"
 msgstr "conflita com"
 
-#: dselect/pkgdisplay.cc:76
+#: dselect/pkgdisplay.cc
 msgid "provides"
 msgstr "inclui"
 
-#: dselect/pkgdisplay.cc:77
+#: dselect/pkgdisplay.cc
 msgid "replaces"
 msgstr "substitui"
 
-#: dselect/pkgdisplay.cc:78
+#: dselect/pkgdisplay.cc
 msgid "enhances"
 msgstr "melhora"
 
-#: dselect/pkgdisplay.cc:81
+#: dselect/pkgdisplay.cc
 msgid "Req"
 msgstr "Req"
 
-#: dselect/pkgdisplay.cc:82
+#: dselect/pkgdisplay.cc
 msgid "Imp"
 msgstr "Imp"
 
-#: dselect/pkgdisplay.cc:83
+#: dselect/pkgdisplay.cc
 msgid "Std"
 msgstr "Pdr"
 
-#: dselect/pkgdisplay.cc:84
+#: dselect/pkgdisplay.cc
 msgid "Opt"
 msgstr "Opc"
 
-#: dselect/pkgdisplay.cc:85
+#: dselect/pkgdisplay.cc
 msgid "Xtr"
 msgstr "Ext"
 
-#: dselect/pkgdisplay.cc:86
+#: dselect/pkgdisplay.cc
 msgid "bUG"
 msgstr "bUG"
 
-#: dselect/pkgdisplay.cc:87
+#: dselect/pkgdisplay.cc
 msgid "?"
 msgstr "?"
 
-#: dselect/pkgdisplay.cc:95 dselect/pkgdisplay.cc:115
+#: dselect/pkgdisplay.cc
 msgid "Broken"
 msgstr "Quebrado"
 
-#: dselect/pkgdisplay.cc:96
+#: dselect/pkgdisplay.cc
 msgid "New"
 msgstr "Novos"
 
-#: dselect/pkgdisplay.cc:97
-msgid "Updated"
-msgstr "Atualizados"
+#: dselect/pkgdisplay.cc
+msgid "Upgradable"
+msgstr ""
 
-#: dselect/pkgdisplay.cc:98
+#: dselect/pkgdisplay.cc
 msgid "Obsolete/local"
 msgstr "Obsoletos/locais"
 
-#: dselect/pkgdisplay.cc:99
-msgid "Up-to-date"
-msgstr "Atualizados"
+#: dselect/pkgdisplay.cc
+msgid "Installed"
+msgstr "Instalado"
 
-#: dselect/pkgdisplay.cc:100
+#: dselect/pkgdisplay.cc
 msgid "Available"
 msgstr "Disponíveis"
 
-#: dselect/pkgdisplay.cc:101 dselect/pkgdisplay.cc:117
+#: dselect/pkgdisplay.cc
 msgid "Removed"
 msgstr "Removidos"
 
-#: dselect/pkgdisplay.cc:102 dselect/pkgdisplay.cc:111
+#: dselect/pkgdisplay.cc
 msgid "Brokenly installed packages"
 msgstr "Pacotes instalados quebrados"
 
-#: dselect/pkgdisplay.cc:103
+#: dselect/pkgdisplay.cc
 msgid "Newly available packages"
 msgstr "Novos pacotes disponíveis"
 
-#: dselect/pkgdisplay.cc:104
-msgid "Updated packages (newer version is available)"
-msgstr "Pacotes atualizados (nova versão está disponível)"
+#: dselect/pkgdisplay.cc
+#, fuzzy
+#| msgid "Newly available packages"
+msgid "Upgradable packages"
+msgstr "Novos pacotes disponíveis"
 
-#: dselect/pkgdisplay.cc:105
-msgid "Obsolete and local packages present on system"
+#: dselect/pkgdisplay.cc
+#, fuzzy
+#| msgid "Obsolete and local packages present on system"
+msgid "Obsolete and locally created packages"
 msgstr "Pacotes obsoletos e locais presentes no sistema"
 
-#: dselect/pkgdisplay.cc:106
-msgid "Up to date installed packages"
-msgstr "Pacotes instalados atualizados"
+#: dselect/pkgdisplay.cc
+msgid "Installed packages"
+msgstr "Pacotes instalados"
 
-#: dselect/pkgdisplay.cc:107
-msgid "Available packages (not currently installed)"
-msgstr "Pacotes disponíveis (não instalados no momento)"
+#: dselect/pkgdisplay.cc
+#, fuzzy
+#| msgid "Up to date installed packages"
+msgid "Available not installed packages"
+msgstr "Pacotes instalados atualizados"
 
-#: dselect/pkgdisplay.cc:108
+#: dselect/pkgdisplay.cc
 msgid "Removed and no longer available packages"
 msgstr "Pacotes removidos e não mais disponíveis"
 
-#: dselect/pkgdisplay.cc:112
-msgid "Installed packages"
-msgstr "Pacotes instalados"
-
-#: dselect/pkgdisplay.cc:113
+#: dselect/pkgdisplay.cc
 msgid "Removed packages (configuration still present)"
 msgstr "Pacotes removidos (configuração ainda presente)"
 
-#: dselect/pkgdisplay.cc:114
+#: dselect/pkgdisplay.cc
 msgid "Purged packages and those never installed"
 msgstr "Pacotes expurgados e os nunca instalados"
 
-#: dselect/pkgdisplay.cc:116
-msgid "Installed"
-msgstr "Instalado"
-
-#: dselect/pkgdisplay.cc:118
+#: dselect/pkgdisplay.cc
 msgid "Purged"
 msgstr "Expurgado"
 
-#: dselect/pkgdisplay.cc:138
+#: dselect/pkgdisplay.cc
 msgid "Error"
 msgstr "Erro"
 
-#: dselect/pkgdisplay.cc:139
+#: dselect/pkgdisplay.cc
 msgid "Installed?"
 msgstr "Instalado?"
 
-#: dselect/pkgdisplay.cc:140
+#: dselect/pkgdisplay.cc
 msgid "Old mark"
 msgstr "Marca antiga"
 
-#: dselect/pkgdisplay.cc:141
+#: dselect/pkgdisplay.cc
 msgid "Marked for"
 msgstr "Marcado para"
 
-#: dselect/pkgdisplay.cc:143
+#: dselect/pkgdisplay.cc
 msgid "EIOM"
 msgstr "EIOM"
 
-#: dselect/pkgdisplay.cc:147 dselect/pkgdisplay.cc:150
+#: dselect/pkgdisplay.cc
 msgid "Section"
 msgstr "Seção"
 
-#: dselect/pkgdisplay.cc:148
+#: dselect/pkgdisplay.cc
 msgid "Priority"
 msgstr "Prioridade"
 
-#: dselect/pkgdisplay.cc:152
+#: dselect/pkgdisplay.cc
 msgid "Package"
 msgstr "Pacote"
 
-#: dselect/pkgdisplay.cc:161 dselect/pkgdisplay.cc:165
+#: dselect/pkgdisplay.cc
 #, fuzzy
 #| msgid "Avail.ver"
 msgid "Avail.arch"
 msgstr "Ver.disp."
 
-#: dselect/pkgdisplay.cc:164
+#: dselect/pkgdisplay.cc
 #, fuzzy
 #| msgid "Inst.ver"
 msgid "Inst.arch"
 msgstr "Ver.inst."
 
-#: dselect/pkgdisplay.cc:178 dselect/pkgdisplay.cc:182
+#: dselect/pkgdisplay.cc
 msgid "Avail.ver"
 msgstr "Ver.disp."
 
-#: dselect/pkgdisplay.cc:181
+#: dselect/pkgdisplay.cc
 msgid "Inst.ver"
 msgstr "Ver.inst."
 
-#: dselect/pkgdisplay.cc:197
+#: dselect/pkgdisplay.cc
 msgid "dselect - recursive package listing"
 msgstr "dselect - lista recursiva de pacotes"
 
-#: dselect/pkgdisplay.cc:199
+#: dselect/pkgdisplay.cc
 msgid "dselect - inspection of package states"
 msgstr "dselect - inspeção dos estados dos pacotes"
 
-#: dselect/pkgdisplay.cc:200
+#: dselect/pkgdisplay.cc
 msgid "dselect - main package listing"
 msgstr "dselect - lista principal de pacotes"
 
-#: dselect/pkgdisplay.cc:208
+#: dselect/pkgdisplay.cc
 msgid " (by section)"
 msgstr " (por seção)"
 
-#: dselect/pkgdisplay.cc:211
+#: dselect/pkgdisplay.cc
 msgid " (avail., section)"
 msgstr " (disp., seção)"
 
-#: dselect/pkgdisplay.cc:214
+#: dselect/pkgdisplay.cc
 msgid " (status, section)"
 msgstr " (estado, seção)"
 
-#: dselect/pkgdisplay.cc:223
+#: dselect/pkgdisplay.cc
 msgid " (by priority)"
 msgstr " (por prioridade)"
 
-#: dselect/pkgdisplay.cc:226
+#: dselect/pkgdisplay.cc
 msgid " (avail., priority)"
 msgstr " (disp., prioridade)"
 
-#: dselect/pkgdisplay.cc:229
+#: dselect/pkgdisplay.cc
 msgid " (status, priority)"
 msgstr " (estado, prioridade)"
 
-#: dselect/pkgdisplay.cc:238
+#: dselect/pkgdisplay.cc
 msgid " (alphabetically)"
 msgstr " (ordem alfabética)"
 
-#: dselect/pkgdisplay.cc:241
+#: dselect/pkgdisplay.cc
 msgid " (by availability)"
 msgstr " (por disponibilidade)"
 
-#: dselect/pkgdisplay.cc:244
+#: dselect/pkgdisplay.cc
 msgid " (by status)"
 msgstr " (por estado)"
 
-#: dselect/pkgdisplay.cc:259
+#: dselect/pkgdisplay.cc
 msgid " mark:+/=/- terse:v help:?"
 msgstr " marca:+/=/- resumo:v ajuda:?"
 
-#: dselect/pkgdisplay.cc:260
+#: dselect/pkgdisplay.cc
 msgid " mark:+/=/- verbose:v help:?"
 msgstr " marca:+/=/- detalhado:v ajuda:?"
 
-#: dselect/pkgdisplay.cc:262
+#: dselect/pkgdisplay.cc
 msgid " terse:v help:?"
 msgstr " resumo:v ajuda:?"
 
-#: dselect/pkgdisplay.cc:263
+#: dselect/pkgdisplay.cc
 msgid " verbose:v help:?"
 msgstr " detalhado:v ajuda:?"
 
-#: dselect/pkginfo.cc:85
+#: dselect/pkginfo.cc
 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 "
@@ -1647,82 +1661,114 @@ msgstr ""
 "Você pode usar 'o' e 'O' para mudar a ordenação e ter a oportunidade de "
 "marcar pacotes em diferentes tipos de grupos."
 
-#: dselect/pkginfo.cc:98
+#: dselect/pkginfo.cc
 msgid "Interrelationships"
 msgstr "Inter-relações"
 
-#: dselect/pkginfo.cc:117
+#: dselect/pkginfo.cc
 msgid "No description available."
 msgstr "Nenhuma descrição disponível."
 
-#: dselect/pkginfo.cc:135
+#: dselect/pkginfo.cc
 msgid "Installed control file information"
 msgstr "Informação do arquivo de controle instalado"
 
-#: dselect/pkginfo.cc:151
+#: dselect/pkginfo.cc
 msgid "Available control file information"
 msgstr "Informação do arquivo de controle disponível"
 
-#: dselect/pkglist.cc:425
+#: dselect/pkglist.cc
 #, fuzzy
 #| msgid "Installed packages"
 msgid "there are no packages"
 msgstr "Pacotes instalados"
 
-#: dselect/pkglist.cc:521
+#: dselect/pkglist.cc
 msgid "invalid search option given"
 msgstr "fornecida opção de busca inválida"
 
-#: dselect/pkglist.cc:536
+#: dselect/pkglist.cc
 msgid "error in regular expression"
 msgstr "erro na expressão regular"
 
-#: dselect/pkgsublist.cc:111
+#: dselect/pkgsublist.cc
 msgid " does not appear to be available\n"
 msgstr " não parece estar disponível\n"
 
-#: dselect/pkgsublist.cc:131
+#: dselect/pkgsublist.cc
 msgid " or "
 msgstr " ou "
 
-#: dselect/pkgtop.cc:58
+#: dselect/pkgtop.cc
 msgid "All"
 msgstr "Todos"
 
-#: dselect/pkgtop.cc:80
+#: dselect/pkgtop.cc
 msgid "All packages"
 msgstr "Todos os pacotes"
 
-#: dselect/pkgtop.cc:84
+#: dselect/pkgtop.cc
 #, c-format
 msgid "%s packages without a section"
 msgstr "Pacotes %s sem seção"
 
-#: dselect/pkgtop.cc:86
+#: dselect/pkgtop.cc
 #, c-format
 msgid "%s packages in section %s"
 msgstr "Pacotes %s na seção %s"
 
-#: dselect/pkgtop.cc:92
+#: dselect/pkgtop.cc
 #, c-format
 msgid "%s %s packages"
 msgstr "Pacotes %s %s"
 
-#: dselect/pkgtop.cc:96
+#: dselect/pkgtop.cc
 #, c-format
 msgid "%s %s packages without a section"
 msgstr "Pacotes %s %s sem seção"
 
-#: dselect/pkgtop.cc:98
+#: dselect/pkgtop.cc
 #, c-format
 msgid "%s %s packages in section %s"
 msgstr "Pacotes %s %s na seção %s"
 
-#: dselect/pkgtop.cc:119
+#: dselect/pkgtop.cc
 #, c-format
 msgid "%-*s %s%s%s;  %s (was: %s).  %s"
 msgstr "%-*s %s%s%s;  %s (era: %s).  %s"
 
+#, fuzzy
+#~| msgid "Section"
+#~ msgid "Actions:\n"
+#~ msgstr "Seção"
+
+#~ msgid "Colours:\n"
+#~ msgstr "Cores:\n"
+
+#~ msgid "Attributes:\n"
+#~ msgstr "Atributos:\n"
+
+#~ msgid "EOF before option name start"
+#~ msgstr "EOF antes do início do nome da opção"
+
+#~ msgid "EOF before summary"
+#~ msgstr "EOF antes do sumário"
+
+#~ msgid "!Bug!"
+#~ msgstr "!Bug!"
+
+#~ msgid "Updated"
+#~ msgstr "Atualizados"
+
+#~ msgid "Up-to-date"
+#~ msgstr "Atualizados"
+
+#~ msgid "Updated packages (newer version is available)"
+#~ msgstr "Pacotes atualizados (nova versão está disponível)"
+
+#~ msgid "Available packages (not currently installed)"
+#~ msgstr "Pacotes disponíveis (não instalados no momento)"
+
 #~ msgid ""
 #~ "Actions:\n"
 #~ "  access update select install config remove quit\n"
diff --git a/dselect/po/ro.po b/dselect/po/ro.po
index bc2fb38aa..cb15b6b60 100644
--- a/dselect/po/ro.po
+++ b/dselect/po/ro.po
@@ -18,7 +18,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dselect 1.17.0\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2014-12-23 18:12+0100\n"
+"POT-Creation-Date: 2015-04-06 09:37+0200\n"
 "PO-Revision-Date: 2008-06-28 19:11+0300\n"
 "Last-Translator: Eddy Petrișor <eddy.petrisor@gmail.com>\n"
 "Language-Team: Romanian <debian-l10n-romanian@lists.debian.org>\n"
@@ -31,29 +31,29 @@ msgstr ""
 "X-Generator: KBabel 1.11.4\n"
 
 #  spațiile sunt necesare!!
-#: dselect/basecmds.cc:125
+#: dselect/basecmds.cc
 msgid "Search for ? "
 msgstr "Ce căutați ? "
 
-#: dselect/basecmds.cc:149
+#: dselect/basecmds.cc
 msgid "Error: "
 msgstr "Eroare: "
 
-#: dselect/basecmds.cc:180
+#: dselect/basecmds.cc
 msgid "Help: "
 msgstr "Ajutor: "
 
-#: dselect/basecmds.cc:186
+#: dselect/basecmds.cc
 msgid "Press ? for help menu, . for next topic, <space> to exit help."
 msgstr ""
 "Apăsați ? pentru meniul ajutor, . pentru următorul subiect, <spațiu> pentru "
 "ieșire."
 
-#: dselect/basecmds.cc:193
+#: dselect/basecmds.cc
 msgid "Help information is available under the following topics:"
 msgstr "Informații ajutătoare sunt disponibile pentru următoarele subiecte:"
 
-#: dselect/basecmds.cc:201
+#: dselect/basecmds.cc
 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. "
@@ -62,241 +62,241 @@ msgstr ""
 "ajutor,\n"
 "  sau  „.” (oprire totală) pentru a citi fiecare pagină de ajutor. "
 
-#: dselect/basecmds.cc:207
+#: dselect/basecmds.cc
 msgid "error reading keyboard in help"
 msgstr "eroare citire tastatură în ajutor"
 
-#: dselect/baselist.cc:60
+#: dselect/baselist.cc
 msgid "ioctl(TIOCGWINSZ) failed"
 msgstr "eșec ioctl(TIOCGWINSZ)"
 
-#: dselect/baselist.cc:63
+#: dselect/baselist.cc
 msgid "doupdate in SIGWINCH handler failed"
 msgstr "eșec doupdate în descriptorul SIGWINCH"
 
-#: dselect/baselist.cc:72
+#: dselect/baselist.cc
 msgid "failed to restore old SIGWINCH sigact"
 msgstr "eșec la restaurarea vechiului sigact pentru SIGWINCH"
 
-#: dselect/baselist.cc:75
+#: dselect/baselist.cc
 msgid "failed to restore old signal mask"
 msgstr "eșec la restaurarea vechii măști de semnal"
 
-#: dselect/baselist.cc:86
+#: dselect/baselist.cc
 msgid "failed to get old signal mask"
 msgstr "eșec la preluarea vechii măști de semnal"
 
-#: dselect/baselist.cc:88
+#: dselect/baselist.cc
 msgid "failed to get old SIGWINCH sigact"
 msgstr "eșec la preluarea vechiului sigact pentru SIGWINCH"
 
-#: dselect/baselist.cc:93
+#: dselect/baselist.cc
 msgid "failed to block SIGWINCH"
 msgstr "eșec la blocarea lui SIGWINCH"
 
-#: dselect/baselist.cc:99
+#: dselect/baselist.cc
 msgid "failed to set new SIGWINCH sigact"
 msgstr "eșec la inițializarea noului sigact pentru SIGWINCH"
 
-#: dselect/baselist.cc:174
+#: dselect/baselist.cc
 msgid "failed to allocate colour pair"
 msgstr "eșec la alocarea perechii de culori"
 
-#: dselect/baselist.cc:203
+#: dselect/baselist.cc
 msgid "failed to create title window"
 msgstr "eșec la crearea titlului ferestrei"
 
-#: dselect/baselist.cc:207
+#: dselect/baselist.cc
 msgid "failed to create whatinfo window"
 msgstr "eșec la crearea ferestrei de informații"
 
-#: dselect/baselist.cc:211
+#: dselect/baselist.cc
 msgid "failed to create baselist pad"
 msgstr "eșec la crearea zonei listei de bază"
 
-#: dselect/baselist.cc:214
+#: dselect/baselist.cc
 msgid "failed to create heading pad"
 msgstr "eșec la crearea zonei pentru titlul"
 
-#: dselect/baselist.cc:218
+#: dselect/baselist.cc
 msgid "failed to create thisstate pad"
 msgstr "eșec la crearea zonei despre starea curentă"
 
-#: dselect/baselist.cc:222
+#: dselect/baselist.cc
 msgid "failed to create info pad"
 msgstr "eșec la crearea zonei de informare"
 
-#: dselect/baselist.cc:227
+#: dselect/baselist.cc
 msgid "failed to create query window"
 msgstr "eșec la crearea ferestrei de interogare"
 
-#: dselect/baselist.cc:298
+#: dselect/baselist.cc
 msgid "Keybindings"
 msgstr "Combinații de taste"
 
-#: dselect/baselist.cc:347
+#: dselect/baselist.cc
 #, c-format
 msgid "  -- %d%%, press "
 msgstr "  -- %d%%, apăsați "
 
-#: dselect/baselist.cc:350
+#: dselect/baselist.cc
 #, c-format
 msgid "%s for more"
 msgstr "%s pentru mai mult"
 
-#: dselect/baselist.cc:354
+#: dselect/baselist.cc
 #, c-format
 msgid "%s to go back"
 msgstr "%s pentru a merge înapoi"
 
-#: dselect/bindings.cc:78
+#: dselect/bindings.cc
 msgid "[not bound]"
 msgstr "[neasignată]"
 
-#: dselect/bindings.cc:82
+#: dselect/bindings.cc
 #, c-format
 msgid "[unk: %d]"
 msgstr "[necunoscut: %d]"
 
-#: dselect/bindings.cc:141
+#: dselect/bindings.cc
 msgid "Scroll onwards through help/information"
 msgstr "Derulare înainte prin ajutor/informații"
 
-#: dselect/bindings.cc:142
+#: dselect/bindings.cc
 msgid "Scroll backwards through help/information"
 msgstr "Derulare înapoi prin ajutor/informații"
 
-#: dselect/bindings.cc:143
+#: dselect/bindings.cc
 msgid "Move up"
 msgstr "Deplasare în sus"
 
-#: dselect/bindings.cc:144
+#: dselect/bindings.cc
 msgid "Move down"
 msgstr "Deplasare în jos"
 
-#: dselect/bindings.cc:145
+#: dselect/bindings.cc
 msgid "Go to top of list"
 msgstr "Mergi la începutul listei"
 
-#: dselect/bindings.cc:146
+#: dselect/bindings.cc
 msgid "Go to end of list"
 msgstr "Mergi la sfârșitul listei"
 
-#: dselect/bindings.cc:147
+#: dselect/bindings.cc
 msgid "Request help (cycle through help screens)"
 msgstr "Cerere de ajutor (ciclu printre ecranele de ajutor)"
 
-#: dselect/bindings.cc:148
+#: dselect/bindings.cc
 msgid "Cycle through information displays"
 msgstr "Ciclu printre informațiile afișate"
 
-#: dselect/bindings.cc:149
+#: dselect/bindings.cc
 msgid "Redraw display"
 msgstr "Redesenare ecran"
 
-#: dselect/bindings.cc:150
+#: dselect/bindings.cc
 msgid "Scroll onwards through list by 1 line"
 msgstr "Derulare înainte prin listă cu 1 rând"
 
-#: dselect/bindings.cc:151
+#: dselect/bindings.cc
 msgid "Scroll backwards through list by 1 line"
 msgstr "Derulare înapoi prin listă cu 1 rând"
 
-#: dselect/bindings.cc:152
+#: dselect/bindings.cc
 msgid "Scroll onwards through help/information by 1 line"
 msgstr "Derulare înainte prin ajutor/informații cu 1 rând"
 
-#: dselect/bindings.cc:153
+#: dselect/bindings.cc
 msgid "Scroll backwards through help/information by 1 line"
 msgstr "Derulare înapoi prin ajutor/informații cu 1 rând"
 
-#: dselect/bindings.cc:154
+#: dselect/bindings.cc
 msgid "Scroll onwards through list"
 msgstr "Derulare înainte prin listă"
 
-#: dselect/bindings.cc:155
+#: dselect/bindings.cc
 msgid "Scroll backwards through list"
 msgstr "Derulare înapoi prin listă"
 
-#: dselect/bindings.cc:158
+#: dselect/bindings.cc
 msgid "Mark package(s) for installation"
 msgstr "Marchează pachet(ul/ele) pentru instalare"
 
-#: dselect/bindings.cc:159
+#: dselect/bindings.cc
 msgid "Mark package(s) for deinstallation"
 msgstr "Marchează pachet(ul/ele) pentru dezinstalare"
 
-#: dselect/bindings.cc:160
+#: dselect/bindings.cc
 msgid "Mark package(s) for deinstall and purge"
 msgstr "Marchează pachet(ul/ele) pentru dezinstalare și curățare"
 
-#: dselect/bindings.cc:161
+#: dselect/bindings.cc
 msgid "Make highlight more specific"
 msgstr "Evidențierea este mai specifică"
 
-#: dselect/bindings.cc:162
+#: dselect/bindings.cc
 msgid "Make highlight less specific"
 msgstr "Evidențierea este mai generică"
 
-#: dselect/bindings.cc:163
+#: dselect/bindings.cc
 msgid "Search for a package whose name contains a string"
 msgstr "Caută pachetul al cărui nume conține un șir de caractere"
 
-#: dselect/bindings.cc:164
+#: dselect/bindings.cc
 #, fuzzy
 #| msgid "Repeat last search."
 msgid "Repeat last search"
 msgstr "Repetă ultima căutare."
 
-#: dselect/bindings.cc:165
+#: dselect/bindings.cc
 msgid "Swap sort order priority/section"
 msgstr "Comută ordinea de sortare prioritate/secțiune"
 
-#: dselect/bindings.cc:166
+#: dselect/bindings.cc
 msgid "Quit, confirming, and checking dependencies"
 msgstr "Ieșire, confirmare, și verificare dependențe"
 
-#: dselect/bindings.cc:167
+#: dselect/bindings.cc
 msgid "Quit, confirming without check"
 msgstr "Terminare, confirmare fără verificare"
 
-#: dselect/bindings.cc:168
+#: dselect/bindings.cc
 msgid "Quit, rejecting conflict/dependency suggestions"
 msgstr "Terminare, se refuză sugestiile legate de conflicte/dependențe"
 
-#: dselect/bindings.cc:169
+#: dselect/bindings.cc
 msgid "Abort - quit without making changes"
 msgstr "Abandon - terminare fără a face schimbări"
 
-#: dselect/bindings.cc:170
+#: dselect/bindings.cc
 msgid "Revert to old state for all packages"
 msgstr "Revenire la vechile stări pentru toate pachetele"
 
-#: dselect/bindings.cc:171
+#: dselect/bindings.cc
 msgid "Revert to suggested state for all packages"
 msgstr "Revenire la stările sugerate pentru toate pachetele"
 
-#: dselect/bindings.cc:172
+#: dselect/bindings.cc
 msgid "Revert to directly requested state for all packages"
 msgstr "Revenire direct la stările cerute pentru toate pachetele"
 
-#: dselect/bindings.cc:173
+#: dselect/bindings.cc
 msgid "Revert to currently installed state for all packages"
 msgstr "Revenire la starea instalată acum pentru toate pachetele"
 
-#: dselect/bindings.cc:176
+#: dselect/bindings.cc
 msgid "Select currently-highlighted access method"
 msgstr "Selctează metoda care este evidențiată acum"
 
-#: dselect/bindings.cc:177
+#: dselect/bindings.cc
 msgid "Quit without changing selected access method"
 msgstr "Abandonează fără schimbarea metodei de acces selectate"
 
-#: dselect/helpmsgs.cc:29
+#: dselect/helpmsgs.cc
 msgid "Keystrokes"
 msgstr "Combinații taste"
 
-#: dselect/helpmsgs.cc:29
+#: dselect/helpmsgs.cc
 #, fuzzy
 #| msgid ""
 #| "Motion keys: Next/Previous, Top/End, Up/Down, Backwards/Forwards:\n"
@@ -390,11 +390,11 @@ msgstr ""
 "   D     plasează tot, Direct în starea cerută      n, \\  repetă ultima "
 "căutare\n"
 
-#: dselect/helpmsgs.cc:55
+#: dselect/helpmsgs.cc
 msgid "Introduction to package selections"
 msgstr "Introducere în selecția pachetelor"
 
-#: dselect/helpmsgs.cc:55
+#: dselect/helpmsgs.cc
 msgid ""
 "Welcome to dselect's main package listing.\n"
 "\n"
@@ -453,11 +453,11 @@ msgstr ""
 "\n"
 "Apăsați <spațiu> pentru a părăsi ajutorul și a intra în listă.\n"
 
-#: dselect/helpmsgs.cc:80
+#: dselect/helpmsgs.cc
 msgid "Introduction to read-only package list browser"
 msgstr "Introducere a navigatorului listei de pachete, în mod strict citire"
 
-#: dselect/helpmsgs.cc:80
+#: dselect/helpmsgs.cc
 msgid ""
 "Welcome to dselect's main package listing.\n"
 "\n"
@@ -496,11 +496,11 @@ msgstr ""
 "\n"
 "Apăsați <spațiu> pentru a părăsi ajutorul și a intra în listă.\n"
 
-#: dselect/helpmsgs.cc:99
+#: dselect/helpmsgs.cc
 msgid "Introduction to conflict/dependency resolution sub-list"
 msgstr "Introducere a sublistei de rezolvare a conflictelor/dependențelor"
 
-#: dselect/helpmsgs.cc:99
+#: dselect/helpmsgs.cc
 msgid ""
 "Dependency/conflict resolution - introduction.\n"
 "\n"
@@ -565,11 +565,11 @@ msgstr ""
 "Apasați <spațiu> pentru a părăsi ajutorul și a intra în sub-listă; nu "
 "uitați: apăsați „?” pentru ajutor.\n"
 
-#: dselect/helpmsgs.cc:125
+#: dselect/helpmsgs.cc
 msgid "Display, part 1: package listing and status chars"
 msgstr "Afișare, partea 1: lista de pachete și caracterele de stare"
 
-#: dselect/helpmsgs.cc:125
+#: dselect/helpmsgs.cc
 msgid ""
 "The top half of the screen shows a list of packages.  For each package you "
 "see\n"
@@ -635,11 +635,11 @@ msgstr ""
 "numele, versiunea instalată și cea disponibilă (shift-V pentru a\n"
 "afișa/ascunde) și descrierea pe scurt.\n"
 
-#: dselect/helpmsgs.cc:152
+#: dselect/helpmsgs.cc
 msgid "Display, part 2: list highlight; information display"
 msgstr "Afișare, partea a 2-a: evidențierea în listă; afișarea informației"
 
-#: dselect/helpmsgs.cc:152
+#: dselect/helpmsgs.cc
 msgid ""
 "* Highlight: One line in the package list will be highlighted.  It "
 "indicates\n"
@@ -694,11 +694,11 @@ msgstr ""
 "  afișajul de informații sau a-l mări până la a utiliza aproape tot "
 "ecranul.\n"
 
-#: dselect/helpmsgs.cc:176
+#: dselect/helpmsgs.cc
 msgid "Introduction to method selection display"
 msgstr "Introducere a afișării selecției metodei"
 
-#: dselect/helpmsgs.cc:176
+#: dselect/helpmsgs.cc
 msgid ""
 "dselect and dpkg can do automatic installation, loading the package files to "
 "be\n"
@@ -742,11 +742,11 @@ msgstr ""
 "de\n"
 "ajutor, accesibilă apăsând „?”.\n"
 
-#: dselect/helpmsgs.cc:196
+#: dselect/helpmsgs.cc
 msgid "Keystrokes for method selection"
 msgstr "Combinații de taste pentru selectarea metodei"
 
-#: dselect/helpmsgs.cc:196
+#: dselect/helpmsgs.cc
 msgid ""
 "Motion keys: Next/Previous, Top/End, Up/Down, Backwards/Forwards:\n"
 "  j, Down-arrow         k, Up-arrow             move highlight\n"
@@ -796,105 +796,105 @@ msgstr ""
 "  /                căutare (enter pentru renunțare)\n"
 "  \\                repetă ultima căutare\n"
 
-#: dselect/main.cc:63
+#: dselect/main.cc
 msgid "Type dselect --help for help."
 msgstr "Tastați dselect --help pentru ajutor."
 
-#: dselect/main.cc:145
+#: dselect/main.cc
 msgid "a"
 msgstr "a"
 
-#: dselect/main.cc:145
+#: dselect/main.cc
 msgid "[A]ccess"
 msgstr "[A]cces"
 
-#: dselect/main.cc:145
+#: dselect/main.cc
 msgid "Choose the access method to use."
 msgstr "Alegeți metoda de acces folosită."
 
-#: dselect/main.cc:146
+#: dselect/main.cc
 msgid "u"
 msgstr "u"
 
-#: dselect/main.cc:146
+#: dselect/main.cc
 msgid "[U]pdate"
 msgstr "Act[u]alizare"
 
-#: dselect/main.cc:146
+#: dselect/main.cc
 msgid "Update list of available packages, if possible."
 msgstr "Actualizează lista pachetelor disponibile, dacă este posibil."
 
-#: dselect/main.cc:147
+#: dselect/main.cc
 msgid "s"
 msgstr "s"
 
-#: dselect/main.cc:147
+#: dselect/main.cc
 msgid "[S]elect"
 msgstr "[S]elecție"
 
-#: dselect/main.cc:147
+#: dselect/main.cc
 msgid "Request which packages you want on your system."
 msgstr "Cereți pachetele pe care le doriți în sistemul dvs."
 
-#: dselect/main.cc:148
+#: dselect/main.cc
 msgid "i"
 msgstr "i"
 
-#: dselect/main.cc:148
+#: dselect/main.cc
 msgid "[I]nstall"
 msgstr "[I]nstalare"
 
-#: dselect/main.cc:148
+#: dselect/main.cc
 msgid "Install and upgrade wanted packages."
 msgstr "Instalează și actualizează pachetele dorite."
 
-#: dselect/main.cc:149
+#: dselect/main.cc
 msgid "c"
 msgstr "c"
 
-#: dselect/main.cc:149
+#: dselect/main.cc
 msgid "[C]onfig"
 msgstr "[C]onfigurare"
 
-#: dselect/main.cc:149
+#: dselect/main.cc
 msgid "Configure any packages that are unconfigured."
 msgstr "Configurează orice pachet neconfigurat."
 
-#: dselect/main.cc:150
+#: dselect/main.cc
 msgid "r"
 msgstr "r"
 
-#: dselect/main.cc:150
+#: dselect/main.cc
 msgid "[R]emove"
 msgstr "Îndepă[R]tare"
 
-#: dselect/main.cc:150
+#: dselect/main.cc
 msgid "Remove unwanted software."
 msgstr "Îndepărtează programele nedorite."
 
 # semnifică tasta care trebuie apăsată, poate fi schimbată dar trebuie să verificăm conflictele
-#: dselect/main.cc:151
+#: dselect/main.cc
 msgid "q"
 msgstr "q"
 
-#: dselect/main.cc:151
+#: dselect/main.cc
 msgid "[Q]uit"
 msgstr "Ieșire [q]"
 
-#: dselect/main.cc:151
+#: dselect/main.cc
 msgid "Quit dselect."
 msgstr "Ieșire din dselect."
 
-#: dselect/main.cc:152
+#: dselect/main.cc
 msgid "menu"
 msgstr "meniu"
 
-#: dselect/main.cc:157
+#: dselect/main.cc
 #, c-format
 msgid "Debian `%s' package handling frontend version %s.\n"
 msgstr "Interfață de manipulare a pachetelor Debian „%s”, versiunea %s.\n"
 
-#: dselect/main.cc:160
+#: dselect/main.cc
 #, fuzzy
 msgid ""
 "This is free software; see the GNU General Public License version 2 or\n"
@@ -904,20 +904,28 @@ msgstr ""
 "ulterioară pentru condițiile de copiere. NU există NICI o garanție.\n"
 "Vezi %s --licence pentru detalii de licențiere și condiții de copiere.\n"
 
-#: dselect/main.cc:169 dselect/main.cc:217
+#: dselect/main.cc
 msgid "<standard output>"
 msgstr ""
 
-#: dselect/main.cc:180
-#, c-format
+#: dselect/main.cc
+#, fuzzy, c-format
+#| msgid ""
+#| "Usage: %s [<option> ...] [<action> ...]\n"
+#| "\n"
 msgid ""
-"Usage: %s [<option> ...] [<action> ...]\n"
+"Usage: %s [<option>...] [<command>...]\n"
 "\n"
 msgstr ""
 "Utilizare: %s [<opțiune> ...] [<acțiune> ...]\n"
 "\n"
 
-#: dselect/main.cc:184
+#: dselect/main.cc
+#, c-format
+msgid "Commands:\n"
+msgstr ""
+
+#: dselect/main.cc
 #, fuzzy, c-format
 #| msgid ""
 #| "Options:\n"
@@ -931,12 +939,12 @@ msgstr ""
 #| "\n"
 msgid ""
 "Options:\n"
-"  --admindir <directory>     Use <directory> instead of %s.\n"
-"  --expert                   Turn on expert mode.\n"
-"  --debug <file> | -D<file>  Turn on debugging, sending output to <file>.\n"
-"  --colour | --color screenpart:[foreground],[background][:attr[+attr+...]]\n"
-"                             Configure screen colours.\n"
-"\n"
+"      --admindir <directory>       Use <directory> instead of %s.\n"
+"      --expert                     Turn on expert mode.\n"
+"  -D, --debug <file>               Turn on debugging, send output to "
+"<file>.\n"
+"      --color <color-spec>         Configure screen colors.\n"
+"      --colour <color-spec>        Ditto.\n"
 msgstr ""
 "Opțiuni:\n"
 "  --admindir <director>      Folosește <director> în loc de %s.\n"
@@ -946,11 +954,11 @@ msgstr ""
 "  --colour | --color parteecran:[prim plan],[fundal][:atrib[+atrib+..]]\n"
 "                             Configurează culorile ecranului.\n"
 
-#: dselect/main.cc:193
+#: dselect/main.cc
 #, fuzzy, c-format
 msgid ""
-"  --help                     Show this help message.\n"
-"  --version                  Show the version.\n"
+"  -?, --help                       Show this help message.\n"
+"      --version                    Show the version.\n"
 "\n"
 msgstr ""
 "  --help                     Afișează acest mesaj de ajutor.\n"
@@ -958,65 +966,67 @@ msgstr ""
 "  --license | --licence      Afișează licența.\n"
 "\n"
 
-#: dselect/main.cc:197
-#, fuzzy, c-format
-#| msgid "Section"
-msgid "Actions:\n"
-msgstr "Secțiune"
-
-#: dselect/main.cc:202
+#: dselect/main.cc
 #, c-format
-msgid "Screenparts:\n"
+msgid ""
+"<color-spec> is <screen-part>:[<foreground>],[<background>][:"
+"<attr>[+<attr>]...]\n"
+msgstr ""
+
+#: dselect/main.cc
+#, fuzzy, c-format
+#| msgid "Screenparts:\n"
+msgid "<screen-part> is:"
 msgstr "Componente ecran:\n"
 
-#: dselect/main.cc:207
+#: dselect/main.cc
 #, c-format
-msgid "Colours:\n"
-msgstr "Culori:\n"
+msgid "<color> is:"
+msgstr ""
 
-#: dselect/main.cc:212
+#: dselect/main.cc
 #, c-format
-msgid "Attributes:\n"
-msgstr "Atribute:\n"
+msgid "<attr> is:"
+msgstr ""
 
-#: dselect/main.cc:232
+#: dselect/main.cc
 #, c-format
 msgid "couldn't open debug file `%.255s'\n"
 msgstr "nu pot deschide fișierul de depanare „%.255s”\n"
 
-#: dselect/main.cc:253
+#: dselect/main.cc
 #, fuzzy, c-format
 #| msgid "Invalid %s `%s'\n"
 msgid "invalid %s '%s'"
 msgstr "Invalid %s „%s”\n"
 
-#: dselect/main.cc:272
+#: dselect/main.cc
 msgid "screen part"
 msgstr "parte ecran"
 
-#: dselect/main.cc:278
+#: dselect/main.cc
 #, fuzzy
 #| msgid "Null colour specification\n"
 msgid "null colour specification"
 msgstr "Lipsă specificație de culoare\n"
 
-#: dselect/main.cc:286 dselect/main.cc:291
+#: dselect/main.cc
 msgid "colour"
 msgstr "culoare"
 
-#: dselect/main.cc:299
+#: dselect/main.cc
 msgid "colour attribute"
 msgstr "atribut culoare"
 
-#: dselect/main.cc:333
+#: dselect/main.cc
 msgid "Terminal does not appear to support cursor addressing.\n"
 msgstr "Terminalul nu pare să suporte adresare la nivel de cursor.\n"
 
-#: dselect/main.cc:335
+#: dselect/main.cc
 msgid "Terminal does not appear to support highlighting.\n"
 msgstr "Terminalul nu pare să suporte evidențiere.\n"
 
-#: dselect/main.cc:337
+#: dselect/main.cc
 #, c-format
 msgid ""
 "Set your TERM variable correctly, use a better terminal,\n"
@@ -1025,11 +1035,11 @@ msgstr ""
 "Inițializați corect variabila de mediu TERM, folosiți un terminal mai bun,\n"
 "sau faceți asta cu programul de management per pachet %s.\n"
 
-#: dselect/main.cc:340
+#: dselect/main.cc
 msgid "terminal lacks necessary features, giving up"
 msgstr "terminalul nu suportă cerințele necesare, abandonez"
 
-#: dselect/main.cc:425
+#: dselect/main.cc
 msgid ""
 "\n"
 "\n"
@@ -1043,7 +1053,7 @@ msgstr ""
 "Apăsați <enter> pentru confirmarea selecției.  ^L redesenează ecranul.\n"
 "\n"
 
-#: dselect/main.cc:430
+#: dselect/main.cc
 msgid ""
 "Copyright (C) 1994-1996 Ian Jackson.\n"
 "Copyright (C) 2000,2001 Wichert Akkerman.\n"
@@ -1051,7 +1061,7 @@ msgstr ""
 "Drepturi de autor (C) 1994-1996 Ian Jackson.\n"
 "Drepturi de autor (C) 2000,2001 Wichert Akkerman.\n"
 
-#: dselect/main.cc:436
+#: dselect/main.cc
 msgid ""
 "\n"
 "\n"
@@ -1061,57 +1071,57 @@ msgstr ""
 "\n"
 "Acces doar în citire: este disponibilă doar vizualizarea selecțiilor!"
 
-#: dselect/main.cc:455
+#: dselect/main.cc
 msgid "failed to getch in main menu"
 msgstr "eșec în getch în meniul principal"
 
-#: dselect/main.cc:538
+#: dselect/main.cc
 #, c-format
 msgid "unknown action string `%.50s'"
 msgstr "șir acțiune necunoscut „%.50s”"
 
-#: dselect/methlist.cc:66
+#: dselect/methlist.cc
 msgid "Abbrev."
 msgstr "Presc."
 
-#: dselect/methlist.cc:67 dselect/pkgdisplay.cc:188 dselect/pkginfo.cc:110
+#: dselect/methlist.cc dselect/pkgdisplay.cc dselect/pkginfo.cc
 msgid "Description"
 msgstr "Descriere"
 
-#: dselect/methlist.cc:73
+#: dselect/methlist.cc
 msgid "dselect - list of access methods"
 msgstr "dselect - lista metodelor de acces"
 
-#: dselect/methlist.cc:82
+#: dselect/methlist.cc
 #, c-format
 msgid "Access method `%s'."
 msgstr "Metoda de acces „%s”."
 
-#: dselect/methlist.cc:161 dselect/pkglist.cc:587
+#: dselect/methlist.cc dselect/pkglist.cc
 msgid "doupdate failed"
 msgstr "doupdate a eșuat"
 
-#: dselect/methlist.cc:164 dselect/pkglist.cc:590
+#: dselect/methlist.cc dselect/pkglist.cc
 msgid "failed to unblock SIGWINCH"
 msgstr "eșec la deblocarea lui SIGWINCH"
 
-#: dselect/methlist.cc:169 dselect/pkglist.cc:595
+#: dselect/methlist.cc dselect/pkglist.cc
 msgid "failed to re-block SIGWINCH"
 msgstr "eșec la reblocarea lui SIGWINCH"
 
-#: dselect/methlist.cc:170 dselect/pkglist.cc:597
+#: dselect/methlist.cc dselect/pkglist.cc
 msgid "getch failed"
 msgstr "eșec getch"
 
-#: dselect/methlist.cc:187
+#: dselect/methlist.cc
 msgid "Explanation"
 msgstr "Explicație"
 
-#: dselect/methlist.cc:197
+#: dselect/methlist.cc
 msgid "No explanation available."
 msgstr "Nici o explicație disponibilă."
 
-#: dselect/method.cc:67
+#: dselect/method.cc
 #, c-format
 msgid ""
 "\n"
@@ -1122,7 +1132,7 @@ msgstr ""
 "\n"
 "%s: %s\n"
 
-#: dselect/method.cc:70
+#: dselect/method.cc
 msgid ""
 "\n"
 "Press <enter> to continue."
@@ -1130,192 +1140,202 @@ msgstr ""
 "\n"
 "Apăsați <enter> pentru a continua."
 
-#: dselect/method.cc:82
+#: dselect/method.cc
 msgid "cannot unlock access method area"
 msgstr ""
 
-#: dselect/method.cc:96
+#: dselect/method.cc
 #, fuzzy
 #| msgid " does not appear to be available\n"
 msgid "no access methods are available"
 msgstr "nu pare să fie disponibilă\n"
 
-#: dselect/method.cc:115
+#: dselect/method.cc
 msgid "requested operation requires superuser privilege"
 msgstr ""
 
-#: dselect/method.cc:118
+#: dselect/method.cc
 #, fuzzy
 #| msgid "Choose the access method to use."
 msgid "cannot open or create access method lockfile"
 msgstr "Alegeți metoda de acces folosită."
 
-#: dselect/method.cc:125
+#: dselect/method.cc
 msgid "the access method area is already locked"
 msgstr ""
 
-#: dselect/method.cc:128
+#: dselect/method.cc
 #, fuzzy
 #| msgid "dselect - list of access methods"
 msgid "cannot lock access method area"
 msgstr "dselect - lista metodelor de acces"
 
-#: dselect/method.cc:161
+#: dselect/method.cc
 #, c-format
 msgid "Press <enter> to continue.\n"
 msgstr "Apăsați <enter> pentru a continua.\n"
 
-#: dselect/method.cc:162
+#: dselect/method.cc
 #, fuzzy
 msgid "<standard error>"
 msgstr "eroare de scriere la ieșirea standard de erroare"
 
-#: dselect/method.cc:165
+#: dselect/method.cc
 msgid "error reading acknowledgement of program failure message"
 msgstr "eroare la citirea confirmării mesajului de eșec al programului"
 
-#: dselect/method.cc:187
+#: dselect/method.cc
 msgid "no access method is selected or configured"
 msgstr ""
 
-#: dselect/method.cc:196
+#: dselect/method.cc
 msgid "update available list script"
 msgstr "actualizează scriptul de listare/cu liste disponibil"
 
-#: dselect/method.cc:200
+#: dselect/method.cc
 msgid "installation script"
 msgstr "script de instalare"
 
-#: dselect/method.cc:246
+#: dselect/method.cc
 msgid "query/setup script"
 msgstr "script de interogare/pregătire"
 
-#: dselect/methparse.cc:53
+#: dselect/methparse.cc
 #, c-format
 msgid "syntax error in method options file `%.250s' -- %s"
 msgstr "eroare de sintaxă în fișierul de opțiuni pentru metode „%.250s” -- %s"
 
-#: dselect/methparse.cc:59
+#: dselect/methparse.cc
 #, c-format
 msgid "error reading options file `%.250s'"
 msgstr "eroare la citirea fișierului de opțiuni „%.250s”"
 
-#: dselect/methparse.cc:93
+#: dselect/methparse.cc
 #, c-format
 msgid "unable to read `%.250s' directory for reading methods"
 msgstr "nu pot să citesc directorul „%.250s” pentru metodele de citire"
 
-#: dselect/methparse.cc:109
+#: dselect/methparse.cc
 #, c-format
 msgid "method `%.250s' has name that is too long (%d > %d characters)"
 msgstr "metoda „%.250s” are un nume prea lung (%d > %d caractere)"
 
-#: dselect/methparse.cc:120
+#: dselect/methparse.cc
 #, c-format
 msgid "unable to access method script `%.250s'"
 msgstr "imposibilitate de acces la scriptul de metode de acces „%.250s”"
 
-#: dselect/methparse.cc:126
+#: dselect/methparse.cc
 #, c-format
 msgid "unable to read method options file `%.250s'"
 msgstr "citire imposibilă a fișierului de opțiuni pentru metode „%.250s”"
 
-#: dselect/methparse.cc:150
+#: dselect/methparse.cc
 msgid "non-digit where digit wanted"
 msgstr "non-numeric unde se cere numeric"
 
-#: dselect/methparse.cc:153
-msgid "EOF in index string"
+#: dselect/methparse.cc
+#, fuzzy
+#| msgid "EOF in index string"
+msgid "end of file in index string"
 msgstr "EOF în șirul index"
 
-#: dselect/methparse.cc:156
+#: dselect/methparse.cc
 msgid "index string too long"
 msgstr "șir index prea lung"
 
-#: dselect/methparse.cc:159
+#: dselect/methparse.cc
 msgid "newline before option name start"
 msgstr "linie nouă înainte de începerea numelui opțiunii"
 
-#: dselect/methparse.cc:161
-msgid "EOF before option name start"
-msgstr "EOF înainte de începerea numelui opțiunii"
+#: dselect/methparse.cc
+#, fuzzy
+#| msgid "newline before option name start"
+msgid "end of file before option name start"
+msgstr "linie nouă înainte de începerea numelui opțiunii"
 
-#: dselect/methparse.cc:165
+#: dselect/methparse.cc
 msgid "nonalpha where option name start wanted"
 msgstr "nu este literă unde trebuie să înceapă numele opțiunii"
 
-#: dselect/methparse.cc:167
+#: dselect/methparse.cc
 msgid "non-alphanum in option name"
 msgstr "non-alfanumeric în numele opțiunii"
 
-#: dselect/methparse.cc:170
-msgid "EOF in option name"
+#: dselect/methparse.cc
+#, fuzzy
+#| msgid "EOF in option name"
+msgid "end of file in option name"
 msgstr "EOF în numele opțiunii"
 
-#: dselect/methparse.cc:175
+#: dselect/methparse.cc
 msgid "newline before summary"
 msgstr "linie nouă înainte de sumar"
 
-#: dselect/methparse.cc:177
-msgid "EOF before summary"
-msgstr "EOF înainte de sumar"
+#: dselect/methparse.cc
+#, fuzzy
+#| msgid "newline before summary"
+msgid "end of file before summary"
+msgstr "linie nouă înainte de sumar"
 
-#: dselect/methparse.cc:183
-msgid "EOF in summary - missing newline"
+#: dselect/methparse.cc
+#, fuzzy
+#| msgid "EOF in summary - missing newline"
+msgid "end of file in summary - missing newline"
 msgstr "EOF în sumar - lipsește linie nouă"
 
-#: dselect/methparse.cc:193
+#: dselect/methparse.cc
 #, c-format
 msgid "unable to open option description file `%.250s'"
 msgstr "nu pot să deschid fișierul de descriere a opțiunilor „%.250s”"
 
-#: dselect/methparse.cc:197
+#: dselect/methparse.cc
 #, c-format
 msgid "unable to stat option description file `%.250s'"
 msgstr "nu pot să citesc fișierul de descriere a opțiunilor „%.250s”"
 
-#: dselect/methparse.cc:201
+#: dselect/methparse.cc
 #, c-format
 msgid "failed to read option description file `%.250s'"
 msgstr "eșec la citirea fișierul de descriere a opțiunilor „%.250s”"
 
-#: dselect/methparse.cc:204
+#: dselect/methparse.cc
 #, c-format
 msgid "error during read of option description file `%.250s'"
 msgstr "eroare în timpul citirii fișierului cu descrierile opțiunilor „%.250s”"
 
-#: dselect/methparse.cc:227
+#: dselect/methparse.cc
 #, c-format
 msgid "error during read of method options file `%.250s'"
 msgstr "eroare în timpul citirii fișierului cu opțiuni pentru metode „%.250s”"
 
-#: dselect/methparse.cc:250
+#: dselect/methparse.cc
 #, c-format
 msgid "unable to open current option file `%.250s'"
 msgstr "imposibil a deschide fișierulu curent de opțiuni „%.250s”"
 
-#: dselect/methparse.cc:286
+#: dselect/methparse.cc
 #, c-format
 msgid "unable to write new option to `%.250s'"
 msgstr "imposibil a scrie noua opțiune în „%.250s”"
 
-#: dselect/pkgdisplay.cc:36
+#: dselect/pkgdisplay.cc
 msgid "new package"
 msgstr "pachet nou"
 
-#: dselect/pkgdisplay.cc:37
+#: dselect/pkgdisplay.cc
 msgid "install"
 msgstr "instalează"
 
-#: dselect/pkgdisplay.cc:38
+#: dselect/pkgdisplay.cc
 msgid "hold"
 msgstr "păstrează"
 
-#: dselect/pkgdisplay.cc:39
+#: dselect/pkgdisplay.cc
 msgid "remove"
 msgstr "elimină"
 
-#: dselect/pkgdisplay.cc:40
+#: dselect/pkgdisplay.cc
 msgid "purge"
 msgstr "curăță"
 
@@ -1323,331 +1343,325 @@ msgstr "curăță"
 #. * the empty string to store information about the translation. DO NOT
 #. * CHANGE THAT IN A TRANSLATION! The code really relies on that being
 #. * a single space.
-#: dselect/pkgdisplay.cc:47
+#: dselect/pkgdisplay.cc
 msgid " "
 msgstr " "
 
-#: dselect/pkgdisplay.cc:48
+#: dselect/pkgdisplay.cc
 msgid "REINSTALL"
 msgstr "REINSTALEAZĂ"
 
-#: dselect/pkgdisplay.cc:51
+#: dselect/pkgdisplay.cc
 msgid "not installed"
 msgstr "neinstalat"
 
-#: dselect/pkgdisplay.cc:52
+#: dselect/pkgdisplay.cc
 msgid "removed (configs remain)"
 msgstr "îndepărtate (configurările rămân)"
 
-#: dselect/pkgdisplay.cc:53
+#: dselect/pkgdisplay.cc
 msgid "half installed"
 msgstr "jumătate instalate"
 
-#: dselect/pkgdisplay.cc:54
+#: dselect/pkgdisplay.cc
 msgid "unpacked (not set up)"
 msgstr "despachetate (nepregătite)"
 
-#: dselect/pkgdisplay.cc:55
+#: dselect/pkgdisplay.cc
 msgid "half configured (config failed)"
 msgstr ""
 
-#: dselect/pkgdisplay.cc:56
+#: dselect/pkgdisplay.cc
 msgid "awaiting trigger processing"
 msgstr "așteaptă procesarea declanșatorilor"
 
-#: dselect/pkgdisplay.cc:57
+#: dselect/pkgdisplay.cc
 msgid "triggered"
 msgstr "declanșat"
 
-#: dselect/pkgdisplay.cc:58
+#: dselect/pkgdisplay.cc
 msgid "installed"
 msgstr "instalat"
 
-#: dselect/pkgdisplay.cc:61
+#: dselect/pkgdisplay.cc
 msgid "Required"
 msgstr "Necesare"
 
-#: dselect/pkgdisplay.cc:62
+#: dselect/pkgdisplay.cc
 msgid "Important"
 msgstr "Important"
 
-#: dselect/pkgdisplay.cc:63
+#: dselect/pkgdisplay.cc
 msgid "Standard"
 msgstr "Standard"
 
-#: dselect/pkgdisplay.cc:64
+#: dselect/pkgdisplay.cc
 msgid "Optional"
 msgstr "Opțional"
 
-#: dselect/pkgdisplay.cc:65
+#: dselect/pkgdisplay.cc
 msgid "Extra"
 msgstr "Extra"
 
-#: dselect/pkgdisplay.cc:66
-msgid "!Bug!"
-msgstr "!Defect!"
-
-#: dselect/pkgdisplay.cc:67
+#: dselect/pkgdisplay.cc
 msgid "Unclassified"
 msgstr "Neclasificat"
 
-#: dselect/pkgdisplay.cc:70
+#: dselect/pkgdisplay.cc
 msgid "suggests"
 msgstr "sugerează"
 
-#: dselect/pkgdisplay.cc:71
+#: dselect/pkgdisplay.cc
 msgid "recommends"
 msgstr "recomandă"
 
-#: dselect/pkgdisplay.cc:72
+#: dselect/pkgdisplay.cc
 msgid "depends on"
 msgstr "depinde de"
 
-#: dselect/pkgdisplay.cc:73
+#: dselect/pkgdisplay.cc
 msgid "pre-depends on"
 msgstr "ante-dependență de"
 
-#: dselect/pkgdisplay.cc:74
+#: dselect/pkgdisplay.cc
 msgid "breaks"
 msgstr "corupe"
 
-#: dselect/pkgdisplay.cc:75
+#: dselect/pkgdisplay.cc
 msgid "conflicts with"
 msgstr "în conflict cu"
 
-#: dselect/pkgdisplay.cc:76
+#: dselect/pkgdisplay.cc
 msgid "provides"
 msgstr "furnizează"
 
-#: dselect/pkgdisplay.cc:77
+#: dselect/pkgdisplay.cc
 msgid "replaces"
 msgstr "înlocuiește"
 
-#: dselect/pkgdisplay.cc:78
+#: dselect/pkgdisplay.cc
 msgid "enhances"
 msgstr "îmbunătățește"
 
-#: dselect/pkgdisplay.cc:81
+#: dselect/pkgdisplay.cc
 msgid "Req"
 msgstr "Ncs"
 
-#: dselect/pkgdisplay.cc:82
+#: dselect/pkgdisplay.cc
 msgid "Imp"
 msgstr "Imp"
 
-#: dselect/pkgdisplay.cc:83
+#: dselect/pkgdisplay.cc
 msgid "Std"
 msgstr "Std"
 
-#: dselect/pkgdisplay.cc:84
+#: dselect/pkgdisplay.cc
 msgid "Opt"
 msgstr "Opț"
 
-#: dselect/pkgdisplay.cc:85
+#: dselect/pkgdisplay.cc
 msgid "Xtr"
 msgstr "Sup"
 
-#: dselect/pkgdisplay.cc:86
+#: dselect/pkgdisplay.cc
 msgid "bUG"
 msgstr "dFT"
 
-#: dselect/pkgdisplay.cc:87
+#: dselect/pkgdisplay.cc
 msgid "?"
 msgstr "?"
 
-#: dselect/pkgdisplay.cc:95 dselect/pkgdisplay.cc:115
+#: dselect/pkgdisplay.cc
 msgid "Broken"
 msgstr "Deteriorat"
 
-#: dselect/pkgdisplay.cc:96
+#: dselect/pkgdisplay.cc
 msgid "New"
 msgstr "Nou"
 
-#: dselect/pkgdisplay.cc:97
-msgid "Updated"
-msgstr "Actualizat"
+#: dselect/pkgdisplay.cc
+msgid "Upgradable"
+msgstr ""
 
-#: dselect/pkgdisplay.cc:98
+#: dselect/pkgdisplay.cc
 msgid "Obsolete/local"
 msgstr "Învechit/local"
 
-#: dselect/pkgdisplay.cc:99
-msgid "Up-to-date"
-msgstr "La-zi"
+#: dselect/pkgdisplay.cc
+msgid "Installed"
+msgstr "Instalate"
 
-#: dselect/pkgdisplay.cc:100
+#: dselect/pkgdisplay.cc
 msgid "Available"
 msgstr "Disponibil"
 
-#: dselect/pkgdisplay.cc:101 dselect/pkgdisplay.cc:117
+#: dselect/pkgdisplay.cc
 msgid "Removed"
 msgstr "Îndepărtat"
 
-#: dselect/pkgdisplay.cc:102 dselect/pkgdisplay.cc:111
+#: dselect/pkgdisplay.cc
 msgid "Brokenly installed packages"
 msgstr "Pachete instalate defectuos"
 
-#: dselect/pkgdisplay.cc:103
+#: dselect/pkgdisplay.cc
 msgid "Newly available packages"
 msgstr "Pachete noi disponibile"
 
-#: dselect/pkgdisplay.cc:104
-msgid "Updated packages (newer version is available)"
-msgstr "Pachete actualizate (este disponibilă o versiune mai nouă)"
+#: dselect/pkgdisplay.cc
+#, fuzzy
+#| msgid "Newly available packages"
+msgid "Upgradable packages"
+msgstr "Pachete noi disponibile"
 
-#: dselect/pkgdisplay.cc:105
-msgid "Obsolete and local packages present on system"
+#: dselect/pkgdisplay.cc
+#, fuzzy
+#| msgid "Obsolete and local packages present on system"
+msgid "Obsolete and locally created packages"
 msgstr "Pachete învechite și locale existente pe sistem"
 
-#: dselect/pkgdisplay.cc:106
-msgid "Up to date installed packages"
-msgstr "Pachete instalate aduse la zi"
+#: dselect/pkgdisplay.cc
+msgid "Installed packages"
+msgstr "Pachete instalate"
 
-#: dselect/pkgdisplay.cc:107
-msgid "Available packages (not currently installed)"
-msgstr "Pachete disponibile (neinstalate încă)"
+#: dselect/pkgdisplay.cc
+#, fuzzy
+#| msgid "Up to date installed packages"
+msgid "Available not installed packages"
+msgstr "Pachete instalate aduse la zi"
 
-#: dselect/pkgdisplay.cc:108
+#: dselect/pkgdisplay.cc
 msgid "Removed and no longer available packages"
 msgstr "Pachete îndepărtate sau indisponibile"
 
-#: dselect/pkgdisplay.cc:112
-msgid "Installed packages"
-msgstr "Pachete instalate"
-
-#: dselect/pkgdisplay.cc:113
+#: dselect/pkgdisplay.cc
 msgid "Removed packages (configuration still present)"
 msgstr "Pachete îndepărtate (configurarea încă prezentă)"
 
-#: dselect/pkgdisplay.cc:114
+#: dselect/pkgdisplay.cc
 msgid "Purged packages and those never installed"
 msgstr "Pachete curățate și cele care nu au fost niciodată instalate"
 
-#: dselect/pkgdisplay.cc:116
-msgid "Installed"
-msgstr "Instalate"
-
-#: dselect/pkgdisplay.cc:118
+#: dselect/pkgdisplay.cc
 msgid "Purged"
 msgstr "Curățate"
 
-#: dselect/pkgdisplay.cc:138
+#: dselect/pkgdisplay.cc
 msgid "Error"
 msgstr "Eroare"
 
-#: dselect/pkgdisplay.cc:139
+#: dselect/pkgdisplay.cc
 msgid "Installed?"
 msgstr "Instalat?"
 
-#: dselect/pkgdisplay.cc:140
+#: dselect/pkgdisplay.cc
 msgid "Old mark"
 msgstr "Marcaj vechi"
 
-#: dselect/pkgdisplay.cc:141
+#: dselect/pkgdisplay.cc
 msgid "Marked for"
 msgstr "Marcat pentru"
 
-#: dselect/pkgdisplay.cc:143
+#: dselect/pkgdisplay.cc
 msgid "EIOM"
 msgstr "EIOM"
 
-#: dselect/pkgdisplay.cc:147 dselect/pkgdisplay.cc:150
+#: dselect/pkgdisplay.cc
 msgid "Section"
 msgstr "Secțiune"
 
-#: dselect/pkgdisplay.cc:148
+#: dselect/pkgdisplay.cc
 msgid "Priority"
 msgstr "Prioritate"
 
-#: dselect/pkgdisplay.cc:152
+#: dselect/pkgdisplay.cc
 msgid "Package"
 msgstr "Pachet"
 
-#: dselect/pkgdisplay.cc:161 dselect/pkgdisplay.cc:165
+#: dselect/pkgdisplay.cc
 #, fuzzy
 #| msgid "Avail.ver"
 msgid "Avail.arch"
 msgstr "Ver.disp"
 
-#: dselect/pkgdisplay.cc:164
+#: dselect/pkgdisplay.cc
 #, fuzzy
 #| msgid "Inst.ver"
 msgid "Inst.arch"
 msgstr "Ver. Inst"
 
-#: dselect/pkgdisplay.cc:178 dselect/pkgdisplay.cc:182
+#: dselect/pkgdisplay.cc
 msgid "Avail.ver"
 msgstr "Ver.disp"
 
-#: dselect/pkgdisplay.cc:181
+#: dselect/pkgdisplay.cc
 msgid "Inst.ver"
 msgstr "Ver. Inst"
 
-#: dselect/pkgdisplay.cc:197
+#: dselect/pkgdisplay.cc
 msgid "dselect - recursive package listing"
 msgstr "dselect - afișare recursivă a pachetelor"
 
-#: dselect/pkgdisplay.cc:199
+#: dselect/pkgdisplay.cc
 msgid "dselect - inspection of package states"
 msgstr "dselect - inspecția stării pachetelor"
 
-#: dselect/pkgdisplay.cc:200
+#: dselect/pkgdisplay.cc
 msgid "dselect - main package listing"
 msgstr "dselect - lista principală a pachetelor"
 
-#: dselect/pkgdisplay.cc:208
+#: dselect/pkgdisplay.cc
 msgid " (by section)"
 msgstr " (după secțiune)"
 
-#: dselect/pkgdisplay.cc:211
+#: dselect/pkgdisplay.cc
 msgid " (avail., section)"
 msgstr " (disponibil, secțiune)"
 
-#: dselect/pkgdisplay.cc:214
+#: dselect/pkgdisplay.cc
 msgid " (status, section)"
 msgstr " (stare, secțiune)"
 
-#: dselect/pkgdisplay.cc:223
+#: dselect/pkgdisplay.cc
 msgid " (by priority)"
 msgstr " (după prioritate)"
 
-#: dselect/pkgdisplay.cc:226
+#: dselect/pkgdisplay.cc
 msgid " (avail., priority)"
 msgstr " (disponibil, prioritate)"
 
-#: dselect/pkgdisplay.cc:229
+#: dselect/pkgdisplay.cc
 msgid " (status, priority)"
 msgstr " (stare, prioritate)"
 
-#: dselect/pkgdisplay.cc:238
+#: dselect/pkgdisplay.cc
 msgid " (alphabetically)"
 msgstr " (alfabetic)"
 
-#: dselect/pkgdisplay.cc:241
+#: dselect/pkgdisplay.cc
 msgid " (by availability)"
 msgstr " (după disponibilitate)"
 
-#: dselect/pkgdisplay.cc:244
+#: dselect/pkgdisplay.cc
 msgid " (by status)"
 msgstr " (după stare)"
 
-#: dselect/pkgdisplay.cc:259
+#: dselect/pkgdisplay.cc
 msgid " mark:+/=/- terse:v help:?"
 msgstr " marchează:+/=/- concis:v ajutor:?"
 
-#: dselect/pkgdisplay.cc:260
+#: dselect/pkgdisplay.cc
 msgid " mark:+/=/- verbose:v help:?"
 msgstr " marchează:+/=/- detaliat:v ajutor:?"
 
-#: dselect/pkgdisplay.cc:262
+#: dselect/pkgdisplay.cc
 msgid " terse:v help:?"
 msgstr " concis:v ajutor:?"
 
-#: dselect/pkgdisplay.cc:263
+#: dselect/pkgdisplay.cc
 msgid " verbose:v help:?"
 msgstr " detaliat:v ajutor:?"
 
-#: dselect/pkginfo.cc:85
+#: dselect/pkginfo.cc
 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 "
@@ -1667,82 +1681,114 @@ msgstr ""
 "Puteți folosi „o” și „O” pentru schimbarea ordinii de sortare dându-vă "
 "posibilitatea să marcați pachetele în diferite moduri de grupare."
 
-#: dselect/pkginfo.cc:98
+#: dselect/pkginfo.cc
 msgid "Interrelationships"
 msgstr "Inter-relații"
 
-#: dselect/pkginfo.cc:117
+#: dselect/pkginfo.cc
 msgid "No description available."
 msgstr "Nici o descriere disponibilă."
 
-#: dselect/pkginfo.cc:135
+#: dselect/pkginfo.cc
 msgid "Installed control file information"
 msgstr "Informația de control instalată"
 
-#: dselect/pkginfo.cc:151
+#: dselect/pkginfo.cc
 msgid "Available control file information"
 msgstr "Informația de control disponibilă"
 
-#: dselect/pkglist.cc:425
+#: dselect/pkglist.cc
 #, fuzzy
 #| msgid "Installed packages"
 msgid "there are no packages"
 msgstr "Pachete instalate"
 
-#: dselect/pkglist.cc:521
+#: dselect/pkglist.cc
 msgid "invalid search option given"
 msgstr "opțiunea de căutare dată este invalidă"
 
-#: dselect/pkglist.cc:536
+#: dselect/pkglist.cc
 msgid "error in regular expression"
 msgstr "eroare în expresia regulată"
 
-#: dselect/pkgsublist.cc:111
+#: dselect/pkgsublist.cc
 msgid " does not appear to be available\n"
 msgstr "nu pare să fie disponibilă\n"
 
-#: dselect/pkgsublist.cc:131
+#: dselect/pkgsublist.cc
 msgid " or "
 msgstr " sau "
 
-#: dselect/pkgtop.cc:58
+#: dselect/pkgtop.cc
 msgid "All"
 msgstr "Tot"
 
-#: dselect/pkgtop.cc:80
+#: dselect/pkgtop.cc
 msgid "All packages"
 msgstr "Toate pachetele"
 
-#: dselect/pkgtop.cc:84
+#: dselect/pkgtop.cc
 #, c-format
 msgid "%s packages without a section"
 msgstr "%s pachete fără o secțiune"
 
-#: dselect/pkgtop.cc:86
+#: dselect/pkgtop.cc
 #, c-format
 msgid "%s packages in section %s"
 msgstr "%s pachete în secțiunea %s"
 
-#: dselect/pkgtop.cc:92
+#: dselect/pkgtop.cc
 #, c-format
 msgid "%s %s packages"
 msgstr "%s %s pachete"
 
-#: dselect/pkgtop.cc:96
+#: dselect/pkgtop.cc
 #, c-format
 msgid "%s %s packages without a section"
 msgstr "%s %s pachete fără o secțiune"
 
-#: dselect/pkgtop.cc:98
+#: dselect/pkgtop.cc
 #, c-format
 msgid "%s %s packages in section %s"
 msgstr "%s %s pachete în secțiunea %s"
 
-#: dselect/pkgtop.cc:119
+#: dselect/pkgtop.cc
 #, c-format
 msgid "%-*s %s%s%s;  %s (was: %s).  %s"
 msgstr "%-*s %s%s%s;  %s (a fost: %s).  %s"
 
+#, fuzzy
+#~| msgid "Section"
+#~ msgid "Actions:\n"
+#~ msgstr "Secțiune"
+
+#~ msgid "Colours:\n"
+#~ msgstr "Culori:\n"
+
+#~ msgid "Attributes:\n"
+#~ msgstr "Atribute:\n"
+
+#~ msgid "EOF before option name start"
+#~ msgstr "EOF înainte de începerea numelui opțiunii"
+
+#~ msgid "EOF before summary"
+#~ msgstr "EOF înainte de sumar"
+
+#~ msgid "!Bug!"
+#~ msgstr "!Defect!"
+
+#~ msgid "Updated"
+#~ msgstr "Actualizat"
+
+#~ msgid "Up-to-date"
+#~ msgstr "La-zi"
+
+#~ msgid "Updated packages (newer version is available)"
+#~ msgstr "Pachete actualizate (este disponibilă o versiune mai nouă)"
+
+#~ msgid "Available packages (not currently installed)"
+#~ msgstr "Pachete disponibile (neinstalate încă)"
+
 #~ msgid ""
 #~ "Actions:\n"
 #~ "  access update select install config remove quit\n"
diff --git a/dselect/po/ru.po b/dselect/po/ru.po
index 12a01d22e..3a7f1c154 100644
--- a/dselect/po/ru.po
+++ b/dselect/po/ru.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dselect 1.17.22\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2014-12-23 18:12+0100\n"
+"POT-Creation-Date: 2015-04-06 09:37+0200\n"
 "PO-Revision-Date: 2014-12-01 19:18+0300\n"
 "Last-Translator: Yuri Kozlov <yuray@komyakino.ru>\n"
 "Language-Team: Russian <debian-l10n-russian@lists.debian.org>\n"
@@ -21,29 +21,29 @@ msgstr ""
 "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 "X-Generator: Lokalize 1.5\n"
 
-#: dselect/basecmds.cc:125
+#: dselect/basecmds.cc
 msgid "Search for ? "
 msgstr "Искать: "
 
-#: dselect/basecmds.cc:149
+#: dselect/basecmds.cc
 msgid "Error: "
 msgstr "Ошибка: "
 
-#: dselect/basecmds.cc:180
+#: dselect/basecmds.cc
 msgid "Help: "
 msgstr "Справка: "
 
-#: dselect/basecmds.cc:186
+#: dselect/basecmds.cc
 msgid "Press ? for help menu, . for next topic, <space> to exit help."
 msgstr ""
 "Нажмите ? для перехода в меню справки, . для перехода к следующей теме, "
 "<space> для выхода из справки"
 
-#: dselect/basecmds.cc:193
+#: dselect/basecmds.cc
 msgid "Help information is available under the following topics:"
 msgstr "Доступна справочная информация по следующим темам:"
 
-#: dselect/basecmds.cc:201
+#: dselect/basecmds.cc
 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. "
@@ -51,240 +51,240 @@ msgstr ""
 "Нажмите одну из вышеперечисленных клавиш, <space> или «q» для выхода\n"
 "или «.» (точка) для последовательного просмотра страниц. "
 
-#: dselect/basecmds.cc:207
+#: dselect/basecmds.cc
 msgid "error reading keyboard in help"
 msgstr "ошибка ввода с клавиатуры в справке"
 
-#: dselect/baselist.cc:60
+#: dselect/baselist.cc
 msgid "ioctl(TIOCGWINSZ) failed"
 msgstr "работа функции ioctl(TIOCGWINSZ) завершилась неудачно"
 
-#: dselect/baselist.cc:63
+#: dselect/baselist.cc
 msgid "doupdate in SIGWINCH handler failed"
 msgstr ""
 "работа функции doupdate в обработчике сигнала SIGWINCH завершилась неудачно"
 
-#: dselect/baselist.cc:72
+#: dselect/baselist.cc
 msgid "failed to restore old SIGWINCH sigact"
 msgstr "не удалось восстановить старый обработчик сигнала SIGWINCH"
 
-#: dselect/baselist.cc:75
+#: dselect/baselist.cc
 msgid "failed to restore old signal mask"
 msgstr "не удалось восстановить старую маску сигналов"
 
-#: dselect/baselist.cc:86
+#: dselect/baselist.cc
 msgid "failed to get old signal mask"
 msgstr "не удалось получить старую маску сигналов"
 
-#: dselect/baselist.cc:88
+#: dselect/baselist.cc
 msgid "failed to get old SIGWINCH sigact"
 msgstr "не удалось получить старый обработчик сигнала SIGWINCH"
 
-#: dselect/baselist.cc:93
+#: dselect/baselist.cc
 msgid "failed to block SIGWINCH"
 msgstr "не удалось блокировать сигнал SIGWINCH"
 
-#: dselect/baselist.cc:99
+#: dselect/baselist.cc
 msgid "failed to set new SIGWINCH sigact"
 msgstr "не удалось установить новый обработчик сигнала SIGWINCH"
 
-#: dselect/baselist.cc:174
+#: dselect/baselist.cc
 msgid "failed to allocate colour pair"
 msgstr "не удалось выделить цветовую пару"
 
-#: dselect/baselist.cc:203
+#: dselect/baselist.cc
 msgid "failed to create title window"
 msgstr "не удалось создать окно заголовка"
 
-#: dselect/baselist.cc:207
+#: dselect/baselist.cc
 msgid "failed to create whatinfo window"
 msgstr "не удалось создать окно whatinfo"
 
-#: dselect/baselist.cc:211
+#: dselect/baselist.cc
 msgid "failed to create baselist pad"
 msgstr "не удалось создать страницу baselist"
 
-#: dselect/baselist.cc:214
+#: dselect/baselist.cc
 msgid "failed to create heading pad"
 msgstr "не удалось создать страницу heading"
 
-#: dselect/baselist.cc:218
+#: dselect/baselist.cc
 msgid "failed to create thisstate pad"
 msgstr "не удалось создать страницу thisstate"
 
-#: dselect/baselist.cc:222
+#: dselect/baselist.cc
 msgid "failed to create info pad"
 msgstr "не удалось создать страницу info"
 
-#: dselect/baselist.cc:227
+#: dselect/baselist.cc
 msgid "failed to create query window"
 msgstr "не удалось создать окно запроса"
 
-#: dselect/baselist.cc:298
+#: dselect/baselist.cc
 msgid "Keybindings"
 msgstr "Горячие клавиши"
 
-#: dselect/baselist.cc:347
+#: dselect/baselist.cc
 #, c-format
 msgid "  -- %d%%, press "
 msgstr "  -- %d%%, чтобы "
 
-#: dselect/baselist.cc:350
+#: dselect/baselist.cc
 #, c-format
 msgid "%s for more"
 msgstr "получить подробную информацию, нажмите %s"
 
-#: dselect/baselist.cc:354
+#: dselect/baselist.cc
 #, c-format
 msgid "%s to go back"
 msgstr "вернуться, нажмите %s"
 
-#: dselect/bindings.cc:78
+#: dselect/bindings.cc
 msgid "[not bound]"
 msgstr "[не сопоставлена]"
 
-#: dselect/bindings.cc:82
+#: dselect/bindings.cc
 #, c-format
 msgid "[unk: %d]"
 msgstr "[неизв: %d]"
 
-#: dselect/bindings.cc:141
+#: dselect/bindings.cc
 msgid "Scroll onwards through help/information"
 msgstr "Прокрутка справки/информации в прямом направлении"
 
-#: dselect/bindings.cc:142
+#: dselect/bindings.cc
 msgid "Scroll backwards through help/information"
 msgstr "Прокрутка справки/информации в обратном направлении"
 
-#: dselect/bindings.cc:143
+#: dselect/bindings.cc
 msgid "Move up"
 msgstr "Вверх"
 
-#: dselect/bindings.cc:144
+#: dselect/bindings.cc
 msgid "Move down"
 msgstr "Вниз"
 
-#: dselect/bindings.cc:145
+#: dselect/bindings.cc
 msgid "Go to top of list"
 msgstr "Перейти в начало списка"
 
-#: dselect/bindings.cc:146
+#: dselect/bindings.cc
 msgid "Go to end of list"
 msgstr "Перейти в конец списка"
 
-#: dselect/bindings.cc:147
+#: dselect/bindings.cc
 msgid "Request help (cycle through help screens)"
 msgstr "Справка (циклический проход по экранам справки)"
 
-#: dselect/bindings.cc:148
+#: dselect/bindings.cc
 msgid "Cycle through information displays"
 msgstr "Циклический проход по экранам информации"
 
-#: dselect/bindings.cc:149
+#: dselect/bindings.cc
 msgid "Redraw display"
 msgstr "Перерисовать экран"
 
-#: dselect/bindings.cc:150
+#: dselect/bindings.cc
 msgid "Scroll onwards through list by 1 line"
 msgstr "Прокрутка списка в прямом направлении по одной строке"
 
-#: dselect/bindings.cc:151
+#: dselect/bindings.cc
 msgid "Scroll backwards through list by 1 line"
 msgstr "Прокрутка списка в обратном направлении по одной строке"
 
-#: dselect/bindings.cc:152
+#: dselect/bindings.cc
 msgid "Scroll onwards through help/information by 1 line"
 msgstr "Прокрутка справки/информации в прямом направлении по одной строке"
 
-#: dselect/bindings.cc:153
+#: dselect/bindings.cc
 msgid "Scroll backwards through help/information by 1 line"
 msgstr "Прокрутка справки/информации в обратном направлении по одной строке"
 
-#: dselect/bindings.cc:154
+#: dselect/bindings.cc
 msgid "Scroll onwards through list"
 msgstr "Прокрутка списка в прямом направлении"
 
-#: dselect/bindings.cc:155
+#: dselect/bindings.cc
 msgid "Scroll backwards through list"
 msgstr "Прокрутка списка в обратном направлении"
 
-#: dselect/bindings.cc:158
+#: dselect/bindings.cc
 msgid "Mark package(s) for installation"
 msgstr "Пометить пакет(ы) для установки"
 
-#: dselect/bindings.cc:159
+#: dselect/bindings.cc
 msgid "Mark package(s) for deinstallation"
 msgstr "Пометить пакет(ы) для удаления"
 
-#: dselect/bindings.cc:160
+#: dselect/bindings.cc
 msgid "Mark package(s) for deinstall and purge"
 msgstr "Пометить пакет(ы) для удаления и вычистки"
 
-#: dselect/bindings.cc:161
+#: dselect/bindings.cc
 msgid "Make highlight more specific"
 msgstr "Сделать подсветку более контрастной"
 
-#: dselect/bindings.cc:162
+#: dselect/bindings.cc
 msgid "Make highlight less specific"
 msgstr "Сделать подсветку менее контрастной"
 
-#: dselect/bindings.cc:163
+#: dselect/bindings.cc
 msgid "Search for a package whose name contains a string"
 msgstr "Найти пакет, имя которого содержит строку"
 
-#: dselect/bindings.cc:164
+#: dselect/bindings.cc
 msgid "Repeat last search"
 msgstr "Повторить последний поиск"
 
-#: dselect/bindings.cc:165
+#: dselect/bindings.cc
 msgid "Swap sort order priority/section"
 msgstr "Поменять порядок приоритетов сортировки приоритет/раздел"
 
-#: dselect/bindings.cc:166
+#: dselect/bindings.cc
 msgid "Quit, confirming, and checking dependencies"
 msgstr "Выйти, подтвердив выбор и проверив зависимости"
 
-#: dselect/bindings.cc:167
+#: dselect/bindings.cc
 msgid "Quit, confirming without check"
 msgstr "Выйти, подтвердив выбор, но не проверяя зависимости"
 
-#: dselect/bindings.cc:168
+#: dselect/bindings.cc
 msgid "Quit, rejecting conflict/dependency suggestions"
 msgstr "Выйти, отвергнув предложения, связанные с конфликтами и зависимостями"
 
-#: dselect/bindings.cc:169
+#: dselect/bindings.cc
 msgid "Abort - quit without making changes"
 msgstr "Выход без сохранения изменений"
 
-#: dselect/bindings.cc:170
+#: dselect/bindings.cc
 msgid "Revert to old state for all packages"
 msgstr "Вернуть все пакеты к предыдущему состоянию"
 
-#: dselect/bindings.cc:171
+#: dselect/bindings.cc
 msgid "Revert to suggested state for all packages"
 msgstr "Вернуть все пакеты к предложенному программой состоянию"
 
-#: dselect/bindings.cc:172
+#: dselect/bindings.cc
 msgid "Revert to directly requested state for all packages"
 msgstr "Вернуть все пакеты к непосредственно затребованному состоянию"
 
-#: dselect/bindings.cc:173
+#: dselect/bindings.cc
 msgid "Revert to currently installed state for all packages"
 msgstr "Вернуть все пакеты к установленному в данный момент состоянию"
 
-#: dselect/bindings.cc:176
+#: dselect/bindings.cc
 msgid "Select currently-highlighted access method"
 msgstr "Выбрать выделенный метод доступа"
 
-#: dselect/bindings.cc:177
+#: dselect/bindings.cc
 msgid "Quit without changing selected access method"
 msgstr "Выход без изменения выбранного метода доступа"
 
-#: dselect/helpmsgs.cc:29
+#: dselect/helpmsgs.cc
 msgid "Keystrokes"
 msgstr "Горячие клавиши"
 
-#: dselect/helpmsgs.cc:29
+#: dselect/helpmsgs.cc
 msgid ""
 "Motion keys: Next/Previous, Top/End, Up/Down, Backwards/Forwards:\n"
 "  j, Down-arrow         k, Up-arrow             move highlight\n"
@@ -355,11 +355,11 @@ msgstr ""
 "поиск\n"
 "        затребованное состояние для всех пакетов\n"
 
-#: dselect/helpmsgs.cc:55
+#: dselect/helpmsgs.cc
 msgid "Introduction to package selections"
 msgstr "Вводная информация о списке пакетов"
 
-#: dselect/helpmsgs.cc:55
+#: dselect/helpmsgs.cc
 msgid ""
 "Welcome to dselect's main package listing.\n"
 "\n"
@@ -415,11 +415,11 @@ msgstr ""
 "\n"
 "Чтобы выйти из справки и войти в список пакетов, нажмите <space>.\n"
 
-#: dselect/helpmsgs.cc:80
+#: dselect/helpmsgs.cc
 msgid "Introduction to read-only package list browser"
 msgstr "Вводная информация о просмотре списке пакетов в режиме чтения"
 
-#: dselect/helpmsgs.cc:80
+#: dselect/helpmsgs.cc
 msgid ""
 "Welcome to dselect's main package listing.\n"
 "\n"
@@ -455,13 +455,13 @@ msgstr ""
 "\n"
 "Чтобы выйти из справки и войти в список пакетов, нажмите <space>.\n"
 
-#: dselect/helpmsgs.cc:99
+#: dselect/helpmsgs.cc
 msgid "Introduction to conflict/dependency resolution sub-list"
 msgstr ""
 "Вводная информация о вложенном списке пакетов для разрешения конфликтов/"
 "зависимостей"
 
-#: dselect/helpmsgs.cc:99
+#: dselect/helpmsgs.cc
 msgid ""
 "Dependency/conflict resolution - introduction.\n"
 "\n"
@@ -527,11 +527,11 @@ msgstr ""
 "Чтобы выйти из справки и войти в список пакетов, нажмите <space>. Помните, "
 "что для вызова справки достаточно нажать клавишу «?».\n"
 
-#: dselect/helpmsgs.cc:125
+#: dselect/helpmsgs.cc
 msgid "Display, part 1: package listing and status chars"
 msgstr "Просмотр, часть 1: список пакетов и символы состояния"
 
-#: dselect/helpmsgs.cc:125
+#: dselect/helpmsgs.cc
 msgid ""
 "The top half of the screen shows a list of packages.  For each package you "
 "see\n"
@@ -593,11 +593,11 @@ msgstr ""
 "и доступной версий (shift-V переключает режим отображения) и краткое\n"
 "описание.\n"
 
-#: dselect/helpmsgs.cc:152
+#: dselect/helpmsgs.cc
 msgid "Display, part 2: list highlight; information display"
 msgstr "Просмотр, часть 2: выделение, отображение информации"
 
-#: dselect/helpmsgs.cc:152
+#: dselect/helpmsgs.cc
 msgid ""
 "* Highlight: One line in the package list will be highlighted.  It "
 "indicates\n"
@@ -646,11 +646,11 @@ msgstr ""
 "экрана,\n"
 "  а клавиша «I» скрывает её или расширяет почти до размеров экрана.\n"
 
-#: dselect/helpmsgs.cc:176
+#: dselect/helpmsgs.cc
 msgid "Introduction to method selection display"
 msgstr "Вводная информация об экране выбора метода доступа"
 
-#: dselect/helpmsgs.cc:176
+#: dselect/helpmsgs.cc
 msgid ""
 "dselect and dpkg can do automatic installation, loading the package files to "
 "be\n"
@@ -691,11 +691,11 @@ msgstr ""
 "Полный список горячих клавиш можно получить, нажав клавишу «k» или войдя\n"
 "в общую справку, нажав клавишу «?».\n"
 
-#: dselect/helpmsgs.cc:196
+#: dselect/helpmsgs.cc
 msgid "Keystrokes for method selection"
 msgstr "Горячие клавиши при выборе метода доступа"
 
-#: dselect/helpmsgs.cc:196
+#: dselect/helpmsgs.cc
 msgid ""
 "Motion keys: Next/Previous, Top/End, Up/Down, Backwards/Forwards:\n"
 "  j, Down-arrow         k, Up-arrow             move highlight\n"
@@ -748,104 +748,104 @@ msgstr ""
 "  /                поиск (ввод для отмены)\n"
 "  \\                повторить последний поиск\n"
 
-#: dselect/main.cc:63
+#: dselect/main.cc
 msgid "Type dselect --help for help."
 msgstr "Чтобы получить справку, введите dselect --help."
 
-#: dselect/main.cc:145
+#: dselect/main.cc
 msgid "a"
 msgstr "a"
 
-#: dselect/main.cc:145
+#: dselect/main.cc
 msgid "[A]ccess"
 msgstr "[A] Метод"
 
-#: dselect/main.cc:145
+#: dselect/main.cc
 msgid "Choose the access method to use."
 msgstr "Выбор метода установки."
 
-#: dselect/main.cc:146
+#: dselect/main.cc
 msgid "u"
 msgstr "u"
 
-#: dselect/main.cc:146
+#: dselect/main.cc
 msgid "[U]pdate"
 msgstr "[U] Обновить"
 
-#: dselect/main.cc:146
+#: dselect/main.cc
 msgid "Update list of available packages, if possible."
 msgstr "Обновление списка доступных пакетов."
 
-#: dselect/main.cc:147
+#: dselect/main.cc
 msgid "s"
 msgstr "s"
 
-#: dselect/main.cc:147
+#: dselect/main.cc
 msgid "[S]elect"
 msgstr "[S] Выбрать"
 
-#: dselect/main.cc:147
+#: dselect/main.cc
 msgid "Request which packages you want on your system."
 msgstr "Выбор набора пакетов для установки, обновления и удаления."
 
-#: dselect/main.cc:148
+#: dselect/main.cc
 msgid "i"
 msgstr "i"
 
-#: dselect/main.cc:148
+#: dselect/main.cc
 msgid "[I]nstall"
 msgstr "[I] Установить"
 
-#: dselect/main.cc:148
+#: dselect/main.cc
 msgid "Install and upgrade wanted packages."
 msgstr "Установка и обновление пакетов."
 
-#: dselect/main.cc:149
+#: dselect/main.cc
 msgid "c"
 msgstr "c"
 
-#: dselect/main.cc:149
+#: dselect/main.cc
 msgid "[C]onfig"
 msgstr "[C] Настроить"
 
-#: dselect/main.cc:149
+#: dselect/main.cc
 msgid "Configure any packages that are unconfigured."
 msgstr "Настройка ещё не настроенных пакетов."
 
-#: dselect/main.cc:150
+#: dselect/main.cc
 msgid "r"
 msgstr "r"
 
-#: dselect/main.cc:150
+#: dselect/main.cc
 msgid "[R]emove"
 msgstr "[R] Удалить"
 
-#: dselect/main.cc:150
+#: dselect/main.cc
 msgid "Remove unwanted software."
 msgstr "Удаление ненужных пакетов."
 
-#: dselect/main.cc:151
+#: dselect/main.cc
 msgid "q"
 msgstr "q"
 
-#: dselect/main.cc:151
+#: dselect/main.cc
 msgid "[Q]uit"
 msgstr "[Q] Выход"
 
-#: dselect/main.cc:151
+#: dselect/main.cc
 msgid "Quit dselect."
 msgstr "Выход из программы."
 
-#: dselect/main.cc:152
+#: dselect/main.cc
 msgid "menu"
 msgstr "меню"
 
-#: dselect/main.cc:157
+#: dselect/main.cc
 #, c-format
 msgid "Debian `%s' package handling frontend version %s.\n"
 msgstr "Интерфейс управления пакетами Debian «%s», версия %s.\n"
 
-#: dselect/main.cc:160
+#: dselect/main.cc
 msgid ""
 "This is free software; see the GNU General Public License version 2 or\n"
 "later for copying conditions. There is NO warranty.\n"
@@ -854,29 +854,47 @@ msgstr ""
 "Универсальной общественной лицензии GNU версии 2 или более поздней.\n"
 "НИКАКИЕ гарантии не предоставляются.\n"
 
-#: dselect/main.cc:169 dselect/main.cc:217
+#: dselect/main.cc
 msgid "<standard output>"
 msgstr "<стандартный вывод>"
 
-#: dselect/main.cc:180
-#, c-format
+#: dselect/main.cc
+#, fuzzy, c-format
+#| msgid ""
+#| "Usage: %s [<option> ...] [<action> ...]\n"
+#| "\n"
 msgid ""
-"Usage: %s [<option> ...] [<action> ...]\n"
+"Usage: %s [<option>...] [<command>...]\n"
 "\n"
 msgstr ""
 "Использование: %s [<параметр> …] [<действие> …]\n"
 "\n"
 
-#: dselect/main.cc:184
+#: dselect/main.cc
 #, c-format
+msgid "Commands:\n"
+msgstr ""
+
+#: dselect/main.cc
+#, fuzzy, c-format
+#| msgid ""
+#| "Options:\n"
+#| "  --admindir <directory>     Use <directory> instead of %s.\n"
+#| "  --expert                   Turn on expert mode.\n"
+#| "  --debug <file> | -D<file>  Turn on debugging, sending output to "
+#| "<file>.\n"
+#| "  --colour | --color screenpart:[foreground],[background][:attr[+attr"
+#| "+...]]\n"
+#| "                             Configure screen colours.\n"
+#| "\n"
 msgid ""
 "Options:\n"
-"  --admindir <directory>     Use <directory> instead of %s.\n"
-"  --expert                   Turn on expert mode.\n"
-"  --debug <file> | -D<file>  Turn on debugging, sending output to <file>.\n"
-"  --colour | --color screenpart:[foreground],[background][:attr[+attr+...]]\n"
-"                             Configure screen colours.\n"
-"\n"
+"      --admindir <directory>       Use <directory> instead of %s.\n"
+"      --expert                     Turn on expert mode.\n"
+"  -D, --debug <file>               Turn on debugging, send output to "
+"<file>.\n"
+"      --color <color-spec>         Configure screen colors.\n"
+"      --colour <color-spec>        Ditto.\n"
 msgstr ""
 "Параметры:\n"
 "  --admindir <каталог>       Использовать <каталог> вместо %s.\n"
@@ -887,72 +905,79 @@ msgstr ""
 "                             Настроить цвета экрана.\n"
 "\n"
 
-#: dselect/main.cc:193
-#, c-format
+#: dselect/main.cc
+#, fuzzy, c-format
+#| msgid ""
+#| "  --help                     Show this help message.\n"
+#| "  --version                  Show the version.\n"
+#| "\n"
 msgid ""
-"  --help                     Show this help message.\n"
-"  --version                  Show the version.\n"
+"  -?, --help                       Show this help message.\n"
+"      --version                    Show the version.\n"
 "\n"
 msgstr ""
 "  --help                     Показать эту справку.\n"
 "  --version                  Показать версию.\n"
 "\n"
 
-#: dselect/main.cc:197
+#: dselect/main.cc
 #, c-format
-msgid "Actions:\n"
-msgstr "Действия:\n"
+msgid ""
+"<color-spec> is <screen-part>:[<foreground>],[<background>][:"
+"<attr>[+<attr>]...]\n"
+msgstr ""
 
-#: dselect/main.cc:202
-#, c-format
-msgid "Screenparts:\n"
+#: dselect/main.cc
+#, fuzzy, c-format
+#| msgid "Screenparts:\n"
+msgid "<screen-part> is:"
 msgstr "Секторы экрана:\n"
 
-#: dselect/main.cc:207
+#: dselect/main.cc
 #, c-format
-msgid "Colours:\n"
-msgstr "Цвета:\n"
+msgid "<color> is:"
+msgstr ""
 
-#: dselect/main.cc:212
+#: dselect/main.cc
 #, c-format
-msgid "Attributes:\n"
-msgstr "Атрибуты:\n"
+msgid "<attr> is:"
+msgstr ""
 
-#: dselect/main.cc:232
+#: dselect/main.cc
 #, c-format
 msgid "couldn't open debug file `%.255s'\n"
 msgstr "не удалось открыть отладочный файл «%.255s»\n"
 
-#: dselect/main.cc:253
+#: dselect/main.cc
 #, c-format
 msgid "invalid %s '%s'"
 msgstr "некорректный %s «%s»"
 
-#: dselect/main.cc:272
+#: dselect/main.cc
 msgid "screen part"
 msgstr "сектор экрана"
 
-#: dselect/main.cc:278
+#: dselect/main.cc
 msgid "null colour specification"
 msgstr "задающие цвет значения пусты"
 
-#: dselect/main.cc:286 dselect/main.cc:291
+#: dselect/main.cc
 msgid "colour"
 msgstr "цвет"
 
-#: dselect/main.cc:299
+#: dselect/main.cc
 msgid "colour attribute"
 msgstr "атрибут цвета"
 
-#: dselect/main.cc:333
+#: dselect/main.cc
 msgid "Terminal does not appear to support cursor addressing.\n"
 msgstr "Терминал не поддерживает позиционирование курсора.\n"
 
-#: dselect/main.cc:335
+#: dselect/main.cc
 msgid "Terminal does not appear to support highlighting.\n"
 msgstr "Терминал не поддерживает подсветку.\n"
 
-#: dselect/main.cc:337
+#: dselect/main.cc
 #, c-format
 msgid ""
 "Set your TERM variable correctly, use a better terminal,\n"
@@ -961,11 +986,11 @@ msgstr ""
 "Задайте верное значение переменной TERM, используйте более функциональный\n"
 "терминал или используйте программу управления отдельными пакетами %s.\n"
 
-#: dselect/main.cc:340
+#: dselect/main.cc
 msgid "terminal lacks necessary features, giving up"
 msgstr "у терминала отсутствуют необходимые возможности, останов"
 
-#: dselect/main.cc:425
+#: dselect/main.cc
 msgid ""
 "\n"
 "\n"
@@ -980,7 +1005,7 @@ msgstr ""
 "Нажмите <ввод> для выбора действия.  ^L — перерисовать экран.\n"
 "\n"
 
-#: dselect/main.cc:430
+#: dselect/main.cc
 msgid ""
 "Copyright (C) 1994-1996 Ian Jackson.\n"
 "Copyright (C) 2000,2001 Wichert Akkerman.\n"
@@ -988,7 +1013,7 @@ msgstr ""
 "Copyright (C) 1994-1996 Ian Jackson.\n"
 "Copyright (C) 2000,2001 Wichert Akkerman.\n"
 
-#: dselect/main.cc:436
+#: dselect/main.cc
 msgid ""
 "\n"
 "\n"
@@ -998,57 +1023,57 @@ msgstr ""
 "\n"
 "Доступ только для чтения: доступен только просмотр состояния пакетов!"
 
-#: dselect/main.cc:455
+#: dselect/main.cc
 msgid "failed to getch in main menu"
 msgstr "ожидание нажатия клавиши в главном меню завершилось неудачно"
 
-#: dselect/main.cc:538
+#: dselect/main.cc
 #, c-format
 msgid "unknown action string `%.50s'"
 msgstr "неизвестное действие «%.50s»"
 
-#: dselect/methlist.cc:66
+#: dselect/methlist.cc
 msgid "Abbrev."
 msgstr "Сокр."
 
-#: dselect/methlist.cc:67 dselect/pkgdisplay.cc:188 dselect/pkginfo.cc:110
+#: dselect/methlist.cc dselect/pkgdisplay.cc dselect/pkginfo.cc
 msgid "Description"
 msgstr "Описание"
 
-#: dselect/methlist.cc:73
+#: dselect/methlist.cc
 msgid "dselect - list of access methods"
 msgstr "dselect — список методов доступа"
 
-#: dselect/methlist.cc:82
+#: dselect/methlist.cc
 #, c-format
 msgid "Access method `%s'."
 msgstr "Метод доступа «%s»."
 
-#: dselect/methlist.cc:161 dselect/pkglist.cc:587
+#: dselect/methlist.cc dselect/pkglist.cc
 msgid "doupdate failed"
 msgstr "работа функции doupdate завершилась неудачно"
 
-#: dselect/methlist.cc:164 dselect/pkglist.cc:590
+#: dselect/methlist.cc dselect/pkglist.cc
 msgid "failed to unblock SIGWINCH"
 msgstr "не удалось разблокировать сигнал SIGWINCH"
 
-#: dselect/methlist.cc:169 dselect/pkglist.cc:595
+#: dselect/methlist.cc dselect/pkglist.cc
 msgid "failed to re-block SIGWINCH"
 msgstr "не удалось заново блокировать сигнал SIGWINCH"
 
-#: dselect/methlist.cc:170 dselect/pkglist.cc:597
+#: dselect/methlist.cc dselect/pkglist.cc
 msgid "getch failed"
 msgstr "ожидание нажатия клавиши завершилось неудачно"
 
-#: dselect/methlist.cc:187
+#: dselect/methlist.cc
 msgid "Explanation"
 msgstr "Описание метода"
 
-#: dselect/methlist.cc:197
+#: dselect/methlist.cc
 msgid "No explanation available."
 msgstr "Нет описания."
 
-#: dselect/method.cc:67
+#: dselect/method.cc
 #, c-format
 msgid ""
 "\n"
@@ -1059,7 +1084,7 @@ msgstr ""
 "\n"
 "%s: %s\n"
 
-#: dselect/method.cc:70
+#: dselect/method.cc
 msgid ""
 "\n"
 "Press <enter> to continue."
@@ -1067,190 +1092,200 @@ msgstr ""
 "\n"
 "Чтобы продолжить, нажмите <ввод>."
 
-#: dselect/method.cc:82
+#: dselect/method.cc
 msgid "cannot unlock access method area"
 msgstr "невозможно разблокировать область метода доступа"
 
-#: dselect/method.cc:96
+#: dselect/method.cc
 msgid "no access methods are available"
 msgstr "нет доступных методов доступа"
 
-#: dselect/method.cc:115
+#: dselect/method.cc
 msgid "requested operation requires superuser privilege"
 msgstr "запрошенная операция требует прав суперпользователя"
 
-#: dselect/method.cc:118
+#: dselect/method.cc
 msgid "cannot open or create access method lockfile"
 msgstr "невозможно открыть или создать lockfile метода доступа"
 
-#: dselect/method.cc:125
+#: dselect/method.cc
 msgid "the access method area is already locked"
 msgstr "область метода доступа уже заблокирована"
 
-#: dselect/method.cc:128
+#: dselect/method.cc
 msgid "cannot lock access method area"
 msgstr "невозможно заблокировать область метода доступа"
 
-#: dselect/method.cc:161
+#: dselect/method.cc
 #, c-format
 msgid "Press <enter> to continue.\n"
 msgstr "Чтобы продолжить, нажмите ввод.\n"
 
-#: dselect/method.cc:162
+#: dselect/method.cc
 msgid "<standard error>"
 msgstr "<стандартный поток ошибок>"
 
-#: dselect/method.cc:165
+#: dselect/method.cc
 msgid "error reading acknowledgement of program failure message"
 msgstr "ошибка чтения подтверждения сообщения программы об ошибке"
 
-#: dselect/method.cc:187
+#: dselect/method.cc
 msgid "no access method is selected or configured"
 msgstr "нет выбранного или настроенного метода доступа"
 
-#: dselect/method.cc:196
+#: dselect/method.cc
 msgid "update available list script"
 msgstr "скрипт обновления списка доступных пакетов"
 
-#: dselect/method.cc:200
+#: dselect/method.cc
 msgid "installation script"
 msgstr "скрипт установки"
 
-#: dselect/method.cc:246
+#: dselect/method.cc
 msgid "query/setup script"
 msgstr "скрипт настройки"
 
-#: dselect/methparse.cc:53
+#: dselect/methparse.cc
 #, c-format
 msgid "syntax error in method options file `%.250s' -- %s"
 msgstr "синтаксическая ошибка в файле списка методов «%.250s»: %s"
 
-#: dselect/methparse.cc:59
+#: dselect/methparse.cc
 #, c-format
 msgid "error reading options file `%.250s'"
 msgstr "ошибка чтения списка методов «%.250s»"
 
-#: dselect/methparse.cc:93
+#: dselect/methparse.cc
 #, c-format
 msgid "unable to read `%.250s' directory for reading methods"
 msgstr "не удалось прочитать список методов доступа из каталога «%.250s»"
 
-#: dselect/methparse.cc:109
+#: dselect/methparse.cc
 #, c-format
 msgid "method `%.250s' has name that is too long (%d > %d characters)"
 msgstr "слишком длинное название метода «%.250s» (%d > %d символов)"
 
-#: dselect/methparse.cc:120
+#: dselect/methparse.cc
 #, c-format
 msgid "unable to access method script `%.250s'"
 msgstr "нет доступа к скрипту метода доступа «%.250s»"
 
-#: dselect/methparse.cc:126
+#: dselect/methparse.cc
 #, c-format
 msgid "unable to read method options file `%.250s'"
 msgstr "не удалось прочитать список возможных методов доступа «%.250s»"
 
-#: dselect/methparse.cc:150
+#: dselect/methparse.cc
 msgid "non-digit where digit wanted"
 msgstr "обнаружен символ, не являющийся цифрой"
 
-#: dselect/methparse.cc:153
-msgid "EOF in index string"
+#: dselect/methparse.cc
+#, fuzzy
+#| msgid "EOF in index string"
+msgid "end of file in index string"
 msgstr "в строке списка обнаружен символ конца файла"
 
-#: dselect/methparse.cc:156
+#: dselect/methparse.cc
 msgid "index string too long"
 msgstr "строка списка чересчур длинна"
 
-#: dselect/methparse.cc:159
+#: dselect/methparse.cc
 msgid "newline before option name start"
 msgstr "перед именем метода обнаружен символ конца строки"
 
-#: dselect/methparse.cc:161
-msgid "EOF before option name start"
-msgstr "перед именем метода обнаружен символ конца файла"
+#: dselect/methparse.cc
+#, fuzzy
+#| msgid "newline before option name start"
+msgid "end of file before option name start"
+msgstr "перед именем метода обнаружен символ конца строки"
 
-#: dselect/methparse.cc:165
+#: dselect/methparse.cc
 msgid "nonalpha where option name start wanted"
 msgstr ""
 "в начале имени метода обнаружен символ, не являющийся буквой или символом "
 "подчёркивания"
 
-#: dselect/methparse.cc:167
+#: dselect/methparse.cc
 msgid "non-alphanum in option name"
 msgstr ""
 "в имени метода обнаружен символ, не являющийся буквой, цифрой или символом "
 "подчёркивания"
 
-#: dselect/methparse.cc:170
-msgid "EOF in option name"
+#: dselect/methparse.cc
+#, fuzzy
+#| msgid "EOF in option name"
+msgid "end of file in option name"
 msgstr "в имени метода обнаружен символ конца файла"
 
-#: dselect/methparse.cc:175
+#: dselect/methparse.cc
 msgid "newline before summary"
 msgstr "перед описанием метода обнаружен символ конца строки"
 
-#: dselect/methparse.cc:177
-msgid "EOF before summary"
-msgstr "перед описанием метода обнаружен символ конца файла"
+#: dselect/methparse.cc
+#, fuzzy
+#| msgid "newline before summary"
+msgid "end of file before summary"
+msgstr "перед описанием метода обнаружен символ конца строки"
 
-#: dselect/methparse.cc:183
-msgid "EOF in summary - missing newline"
+#: dselect/methparse.cc
+#, fuzzy
+#| msgid "EOF in summary - missing newline"
+msgid "end of file in summary - missing newline"
 msgstr ""
 "в описании обнаружен символ конца файла — отсутствует символ конца строки"
 
-#: dselect/methparse.cc:193
+#: dselect/methparse.cc
 #, c-format
 msgid "unable to open option description file `%.250s'"
 msgstr "не удалось открыть файл описания метода «%.250s»"
 
-#: dselect/methparse.cc:197
+#: dselect/methparse.cc
 #, c-format
 msgid "unable to stat option description file `%.250s'"
 msgstr "не удалось получить информацию о файле описания метода «%.250s»"
 
-#: dselect/methparse.cc:201
+#: dselect/methparse.cc
 #, c-format
 msgid "failed to read option description file `%.250s'"
 msgstr "ошибка чтения файла описания метода «%.250s»"
 
-#: dselect/methparse.cc:204
+#: dselect/methparse.cc
 #, c-format
 msgid "error during read of option description file `%.250s'"
 msgstr "ошибка чтения файла описания метода доступа «%.250s»"
 
-#: dselect/methparse.cc:227
+#: dselect/methparse.cc
 #, c-format
 msgid "error during read of method options file `%.250s'"
 msgstr "ошибка чтения списка возможных методов доступа «%.250s»"
 
-#: dselect/methparse.cc:250
+#: dselect/methparse.cc
 #, c-format
 msgid "unable to open current option file `%.250s'"
 msgstr "не удалось открыть файл текущего метода доступа «%.250s»"
 
-#: dselect/methparse.cc:286
+#: dselect/methparse.cc
 #, c-format
 msgid "unable to write new option to `%.250s'"
 msgstr "не удалось записать новый файл метода доступа «%.250s»"
 
-#: dselect/pkgdisplay.cc:36
+#: dselect/pkgdisplay.cc
 msgid "new package"
 msgstr "новый пакет"
 
-#: dselect/pkgdisplay.cc:37
+#: dselect/pkgdisplay.cc
 msgid "install"
 msgstr "установить"
 
-#: dselect/pkgdisplay.cc:38
+#: dselect/pkgdisplay.cc
 msgid "hold"
 msgstr "зафиксировать"
 
-#: dselect/pkgdisplay.cc:39
+#: dselect/pkgdisplay.cc
 msgid "remove"
 msgstr "удалить"
 
-#: dselect/pkgdisplay.cc:40
+#: dselect/pkgdisplay.cc
 msgid "purge"
 msgstr "вычистить"
 
@@ -1258,327 +1293,321 @@ msgstr "вычистить"
 #. * the empty string to store information about the translation. DO NOT
 #. * CHANGE THAT IN A TRANSLATION! The code really relies on that being
 #. * a single space.
-#: dselect/pkgdisplay.cc:47
+#: dselect/pkgdisplay.cc
 msgid " "
 msgstr " "
 
-#: dselect/pkgdisplay.cc:48
+#: dselect/pkgdisplay.cc
 msgid "REINSTALL"
 msgstr "ПЕРЕУСТАНОВИТЬ"
 
-#: dselect/pkgdisplay.cc:51
+#: dselect/pkgdisplay.cc
 msgid "not installed"
 msgstr "не установлен"
 
-#: dselect/pkgdisplay.cc:52
+#: dselect/pkgdisplay.cc
 msgid "removed (configs remain)"
 msgstr "удалён, но файлы конфигурации сохранены"
 
-#: dselect/pkgdisplay.cc:53
+#: dselect/pkgdisplay.cc
 msgid "half installed"
 msgstr "частично установлен"
 
-#: dselect/pkgdisplay.cc:54
+#: dselect/pkgdisplay.cc
 msgid "unpacked (not set up)"
 msgstr "распакован, но не настроен"
 
-#: dselect/pkgdisplay.cc:55
+#: dselect/pkgdisplay.cc
 msgid "half configured (config failed)"
 msgstr "наполовину настроен (не удалось настроить)"
 
-#: dselect/pkgdisplay.cc:56
+#: dselect/pkgdisplay.cc
 msgid "awaiting trigger processing"
 msgstr "ожидает начала обработки"
 
-#: dselect/pkgdisplay.cc:57
+#: dselect/pkgdisplay.cc
 msgid "triggered"
 msgstr "обработка начата"
 
-#: dselect/pkgdisplay.cc:58
+#: dselect/pkgdisplay.cc
 msgid "installed"
 msgstr "установлен"
 
-#: dselect/pkgdisplay.cc:61
+#: dselect/pkgdisplay.cc
 msgid "Required"
 msgstr "Обязательный"
 
-#: dselect/pkgdisplay.cc:62
+#: dselect/pkgdisplay.cc
 msgid "Important"
 msgstr "Важный"
 
-#: dselect/pkgdisplay.cc:63
+#: dselect/pkgdisplay.cc
 msgid "Standard"
 msgstr "Стандартный"
 
-#: dselect/pkgdisplay.cc:64
+#: dselect/pkgdisplay.cc
 msgid "Optional"
 msgstr "Дополнительный"
 
-#: dselect/pkgdisplay.cc:65
+#: dselect/pkgdisplay.cc
 msgid "Extra"
 msgstr "Экстра"
 
-#: dselect/pkgdisplay.cc:66
-msgid "!Bug!"
-msgstr "!Ошибка!"
-
-#: dselect/pkgdisplay.cc:67
+#: dselect/pkgdisplay.cc
 msgid "Unclassified"
 msgstr "Приоритет не определён"
 
-#: dselect/pkgdisplay.cc:70
+#: dselect/pkgdisplay.cc
 msgid "suggests"
 msgstr "предлагает"
 
-#: dselect/pkgdisplay.cc:71
+#: dselect/pkgdisplay.cc
 msgid "recommends"
 msgstr "рекомендует"
 
-#: dselect/pkgdisplay.cc:72
+#: dselect/pkgdisplay.cc
 msgid "depends on"
 msgstr "зависит от"
 
-#: dselect/pkgdisplay.cc:73
+#: dselect/pkgdisplay.cc
 msgid "pre-depends on"
 msgstr "требует предварительной установки"
 
-#: dselect/pkgdisplay.cc:74
+#: dselect/pkgdisplay.cc
 msgid "breaks"
 msgstr "ломает"
 
-#: dselect/pkgdisplay.cc:75
+#: dselect/pkgdisplay.cc
 msgid "conflicts with"
 msgstr "конфликтует с"
 
-#: dselect/pkgdisplay.cc:76
+#: dselect/pkgdisplay.cc
 msgid "provides"
 msgstr "предоставляет"
 
-#: dselect/pkgdisplay.cc:77
+#: dselect/pkgdisplay.cc
 msgid "replaces"
 msgstr "заменяет"
 
-#: dselect/pkgdisplay.cc:78
+#: dselect/pkgdisplay.cc
 msgid "enhances"
 msgstr "расширяет"
 
-#: dselect/pkgdisplay.cc:81
+#: dselect/pkgdisplay.cc
 msgid "Req"
 msgstr "Обз"
 
-#: dselect/pkgdisplay.cc:82
+#: dselect/pkgdisplay.cc
 msgid "Imp"
 msgstr "Вжн"
 
-#: dselect/pkgdisplay.cc:83
+#: dselect/pkgdisplay.cc
 msgid "Std"
 msgstr "Стд"
 
-#: dselect/pkgdisplay.cc:84
+#: dselect/pkgdisplay.cc
 msgid "Opt"
 msgstr "Доп"
 
-#: dselect/pkgdisplay.cc:85
+#: dselect/pkgdisplay.cc
 msgid "Xtr"
 msgstr "Экс"
 
-#: dselect/pkgdisplay.cc:86
+#: dselect/pkgdisplay.cc
 msgid "bUG"
 msgstr "оШБ"
 
-#: dselect/pkgdisplay.cc:87
+#: dselect/pkgdisplay.cc
 msgid "?"
 msgstr "?"
 
-#: dselect/pkgdisplay.cc:95 dselect/pkgdisplay.cc:115
+#: dselect/pkgdisplay.cc
 msgid "Broken"
 msgstr "Неработоспособные"
 
-#: dselect/pkgdisplay.cc:96
+#: dselect/pkgdisplay.cc
 msgid "New"
 msgstr "Новые"
 
-#: dselect/pkgdisplay.cc:97
-msgid "Updated"
-msgstr "Обновлённые"
+#: dselect/pkgdisplay.cc
+msgid "Upgradable"
+msgstr ""
 
-#: dselect/pkgdisplay.cc:98
+#: dselect/pkgdisplay.cc
 msgid "Obsolete/local"
 msgstr "Устаревшие/локальные"
 
-#: dselect/pkgdisplay.cc:99
-msgid "Up-to-date"
-msgstr "Актуальные"
+#: dselect/pkgdisplay.cc
+msgid "Installed"
+msgstr "Установлен"
 
-#: dselect/pkgdisplay.cc:100
+#: dselect/pkgdisplay.cc
 msgid "Available"
 msgstr "Доступные"
 
-#: dselect/pkgdisplay.cc:101 dselect/pkgdisplay.cc:117
+#: dselect/pkgdisplay.cc
 msgid "Removed"
 msgstr "Удалённые"
 
-#: dselect/pkgdisplay.cc:102 dselect/pkgdisplay.cc:111
+#: dselect/pkgdisplay.cc
 msgid "Brokenly installed packages"
 msgstr "Пакеты, установка которых завершилась неудачно"
 
-#: dselect/pkgdisplay.cc:103
+#: dselect/pkgdisplay.cc
 msgid "Newly available packages"
 msgstr "Новые доступные пакеты"
 
-#: dselect/pkgdisplay.cc:104
-msgid "Updated packages (newer version is available)"
-msgstr "Обновлённые пакеты (доступна новая версия)"
+#: dselect/pkgdisplay.cc
+#, fuzzy
+#| msgid "Newly available packages"
+msgid "Upgradable packages"
+msgstr "Новые доступные пакеты"
 
-#: dselect/pkgdisplay.cc:105
-msgid "Obsolete and local packages present on system"
+#: dselect/pkgdisplay.cc
+#, fuzzy
+#| msgid "Obsolete and local packages present on system"
+msgid "Obsolete and locally created packages"
 msgstr "Установленные устаревшие или локальные пакеты"
 
-#: dselect/pkgdisplay.cc:106
-msgid "Up to date installed packages"
-msgstr "Установленные актуальные пакеты"
+#: dselect/pkgdisplay.cc
+msgid "Installed packages"
+msgstr "Установленные пакеты"
 
-#: dselect/pkgdisplay.cc:107
-msgid "Available packages (not currently installed)"
-msgstr "Доступные не установленные пакеты"
+#: dselect/pkgdisplay.cc
+#, fuzzy
+#| msgid "Up to date installed packages"
+msgid "Available not installed packages"
+msgstr "Установленные актуальные пакеты"
 
-#: dselect/pkgdisplay.cc:108
+#: dselect/pkgdisplay.cc
 msgid "Removed and no longer available packages"
 msgstr "Удалённые или более недоступные пакеты"
 
-#: dselect/pkgdisplay.cc:112
-msgid "Installed packages"
-msgstr "Установленные пакеты"
-
-#: dselect/pkgdisplay.cc:113
+#: dselect/pkgdisplay.cc
 msgid "Removed packages (configuration still present)"
 msgstr "Удалённые пакеты (файлы конфигурации сохранены)"
 
-#: dselect/pkgdisplay.cc:114
+#: dselect/pkgdisplay.cc
 msgid "Purged packages and those never installed"
 msgstr "Вычищенные и никогда не устанавливавшиеся пакеты"
 
-#: dselect/pkgdisplay.cc:116
-msgid "Installed"
-msgstr "Установлен"
-
-#: dselect/pkgdisplay.cc:118
+#: dselect/pkgdisplay.cc
 msgid "Purged"
 msgstr "Вычищен"
 
-#: dselect/pkgdisplay.cc:138
+#: dselect/pkgdisplay.cc
 msgid "Error"
 msgstr "Ошибка"
 
-#: dselect/pkgdisplay.cc:139
+#: dselect/pkgdisplay.cc
 msgid "Installed?"
 msgstr "Установлен?"
 
-#: dselect/pkgdisplay.cc:140
+#: dselect/pkgdisplay.cc
 msgid "Old mark"
 msgstr "Был помечен для"
 
-#: dselect/pkgdisplay.cc:141
+#: dselect/pkgdisplay.cc
 msgid "Marked for"
 msgstr "Помечен для"
 
-#: dselect/pkgdisplay.cc:143
+#: dselect/pkgdisplay.cc
 msgid "EIOM"
 msgstr "ОУБП"
 
-#: dselect/pkgdisplay.cc:147 dselect/pkgdisplay.cc:150
+#: dselect/pkgdisplay.cc
 msgid "Section"
 msgstr "Раздел"
 
-#: dselect/pkgdisplay.cc:148
+#: dselect/pkgdisplay.cc
 msgid "Priority"
 msgstr "Приоритет"
 
-#: dselect/pkgdisplay.cc:152
+#: dselect/pkgdisplay.cc
 msgid "Package"
 msgstr "Пакет"
 
-#: dselect/pkgdisplay.cc:161 dselect/pkgdisplay.cc:165
+#: dselect/pkgdisplay.cc
 msgid "Avail.arch"
 msgstr "Дост.арх."
 
-#: dselect/pkgdisplay.cc:164
+#: dselect/pkgdisplay.cc
 msgid "Inst.arch"
 msgstr "Уст.арх."
 
-#: dselect/pkgdisplay.cc:178 dselect/pkgdisplay.cc:182
+#: dselect/pkgdisplay.cc
 msgid "Avail.ver"
 msgstr "Дост.верс."
 
-#: dselect/pkgdisplay.cc:181
+#: dselect/pkgdisplay.cc
 msgid "Inst.ver"
 msgstr "Уст.верс."
 
-#: dselect/pkgdisplay.cc:197
+#: dselect/pkgdisplay.cc
 msgid "dselect - recursive package listing"
 msgstr "dselect — вложенный список пакетов"
 
-#: dselect/pkgdisplay.cc:199
+#: dselect/pkgdisplay.cc
 msgid "dselect - inspection of package states"
 msgstr "dselect — просмотр состояний пакетов"
 
-#: dselect/pkgdisplay.cc:200
+#: dselect/pkgdisplay.cc
 msgid "dselect - main package listing"
 msgstr "dselect — основной список пакетов"
 
-#: dselect/pkgdisplay.cc:208
+#: dselect/pkgdisplay.cc
 msgid " (by section)"
 msgstr " (по разделу)"
 
-#: dselect/pkgdisplay.cc:211
+#: dselect/pkgdisplay.cc
 msgid " (avail., section)"
 msgstr " (доступность, раздел)"
 
-#: dselect/pkgdisplay.cc:214
+#: dselect/pkgdisplay.cc
 msgid " (status, section)"
 msgstr " (состояние, раздел)"
 
-#: dselect/pkgdisplay.cc:223
+#: dselect/pkgdisplay.cc
 msgid " (by priority)"
 msgstr " (по приоритету)"
 
-#: dselect/pkgdisplay.cc:226
+#: dselect/pkgdisplay.cc
 msgid " (avail., priority)"
 msgstr " (доступность, приоритет)"
 
-#: dselect/pkgdisplay.cc:229
+#: dselect/pkgdisplay.cc
 msgid " (status, priority)"
 msgstr " (состояние, приоритет)"
 
-#: dselect/pkgdisplay.cc:238
+#: dselect/pkgdisplay.cc
 msgid " (alphabetically)"
 msgstr " (по алфавиту)"
 
-#: dselect/pkgdisplay.cc:241
+#: dselect/pkgdisplay.cc
 msgid " (by availability)"
 msgstr " (по доступности)"
 
-#: dselect/pkgdisplay.cc:244
+#: dselect/pkgdisplay.cc
 msgid " (by status)"
 msgstr " (по состоянию)"
 
-#: dselect/pkgdisplay.cc:259
+#: dselect/pkgdisplay.cc
 msgid " mark:+/=/- terse:v help:?"
 msgstr " отметить:+/=/- кратко:v подсказка:?"
 
-#: dselect/pkgdisplay.cc:260
+#: dselect/pkgdisplay.cc
 msgid " mark:+/=/- verbose:v help:?"
 msgstr " отметить:+/=/- подробно:v подсказка:?"
 
-#: dselect/pkgdisplay.cc:262
+#: dselect/pkgdisplay.cc
 msgid " terse:v help:?"
 msgstr " кратко:v подсказка:?"
 
-#: dselect/pkgdisplay.cc:263
+#: dselect/pkgdisplay.cc
 msgid " verbose:v help:?"
 msgstr " подробно:v подсказка:?"
 
-#: dselect/pkginfo.cc:85
+#: dselect/pkginfo.cc
 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 "
@@ -1598,80 +1627,110 @@ msgstr ""
 "Используйте клавиши «o» и «O» для изменения порядка сортировки пакетов. Это "
 "позволит отмечать пакеты, пользуясь широким набором критериев."
 
-#: dselect/pkginfo.cc:98
+#: dselect/pkginfo.cc
 msgid "Interrelationships"
 msgstr "зависимости"
 
-#: dselect/pkginfo.cc:117
+#: dselect/pkginfo.cc
 msgid "No description available."
 msgstr "Описание отсутствует."
 
-#: dselect/pkginfo.cc:135
+#: dselect/pkginfo.cc
 msgid "Installed control file information"
 msgstr "Установлена информация из файла control"
 
-#: dselect/pkginfo.cc:151
+#: dselect/pkginfo.cc
 msgid "Available control file information"
 msgstr "Доступна информация из файла control"
 
-#: dselect/pkglist.cc:425
+#: dselect/pkglist.cc
 msgid "there are no packages"
 msgstr "нет пакетов"
 
-#: dselect/pkglist.cc:521
+#: dselect/pkglist.cc
 msgid "invalid search option given"
 msgstr "заданы неверные параметры поиска"
 
-#: dselect/pkglist.cc:536
+#: dselect/pkglist.cc
 msgid "error in regular expression"
 msgstr "некорректное регулярное выражение"
 
-#: dselect/pkgsublist.cc:111
+#: dselect/pkgsublist.cc
 msgid " does not appear to be available\n"
 msgstr " недоступен\n"
 
-#: dselect/pkgsublist.cc:131
+#: dselect/pkgsublist.cc
 msgid " or "
 msgstr " или "
 
-#: dselect/pkgtop.cc:58
+#: dselect/pkgtop.cc
 msgid "All"
 msgstr "Все"
 
-#: dselect/pkgtop.cc:80
+#: dselect/pkgtop.cc
 msgid "All packages"
 msgstr "Все пакеты"
 
-#: dselect/pkgtop.cc:84
+#: dselect/pkgtop.cc
 #, c-format
 msgid "%s packages without a section"
 msgstr "%s пакеты вне известных разделов"
 
-#: dselect/pkgtop.cc:86
+#: dselect/pkgtop.cc
 #, c-format
 msgid "%s packages in section %s"
 msgstr "%s пакеты в разделе %s"
 
-#: dselect/pkgtop.cc:92
+#: dselect/pkgtop.cc
 #, c-format
 msgid "%s %s packages"
 msgstr "%s пакеты приоритета %s"
 
-#: dselect/pkgtop.cc:96
+#: dselect/pkgtop.cc
 #, c-format
 msgid "%s %s packages without a section"
 msgstr "%s пакеты приоритета %s вне известных разделов"
 
-#: dselect/pkgtop.cc:98
+#: dselect/pkgtop.cc
 #, c-format
 msgid "%s %s packages in section %s"
 msgstr "%s пакеты приоритета %s в разделе %s"
 
-#: dselect/pkgtop.cc:119
+#: dselect/pkgtop.cc
 #, c-format
 msgid "%-*s %s%s%s;  %s (was: %s).  %s"
 msgstr "%-*s %s%s%s;  %s (было: %s).  %s"
 
+#~ msgid "Actions:\n"
+#~ msgstr "Действия:\n"
+
+#~ msgid "Colours:\n"
+#~ msgstr "Цвета:\n"
+
+#~ msgid "Attributes:\n"
+#~ msgstr "Атрибуты:\n"
+
+#~ msgid "EOF before option name start"
+#~ msgstr "перед именем метода обнаружен символ конца файла"
+
+#~ msgid "EOF before summary"
+#~ msgstr "перед описанием метода обнаружен символ конца файла"
+
+#~ msgid "!Bug!"
+#~ msgstr "!Ошибка!"
+
+#~ msgid "Updated"
+#~ msgstr "Обновлённые"
+
+#~ msgid "Up-to-date"
+#~ msgstr "Актуальные"
+
+#~ msgid "Updated packages (newer version is available)"
+#~ msgstr "Обновлённые пакеты (доступна новая версия)"
+
+#~ msgid "Available packages (not currently installed)"
+#~ msgstr "Доступные не установленные пакеты"
+
 #~ msgid "foreign architectures enabled but multi-arch is not supported"
 #~ msgstr "включены неродные архитектуры, но multi-arch не поддерживается"
 
diff --git a/dselect/po/sk.po b/dselect/po/sk.po
index 1bad60a28..ad2fca767 100644
--- a/dselect/po/sk.po
+++ b/dselect/po/sk.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dselect 1.13\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2014-12-23 18:12+0100\n"
+"POT-Creation-Date: 2015-04-06 09:37+0200\n"
 "PO-Revision-Date: 2012-07-03 01:09+0100\n"
 "Last-Translator: Ivan Masár <helix84@centrum.sk>\n"
 "Language-Team: Slovak <debian-l10n-slovak@lists.debian.org>\n"
@@ -19,29 +19,29 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: dselect/basecmds.cc:125
+#: dselect/basecmds.cc
 msgid "Search for ? "
 msgstr "Vyhľadať ? "
 
-#: dselect/basecmds.cc:149
+#: dselect/basecmds.cc
 msgid "Error: "
 msgstr "Chyba: "
 
-#: dselect/basecmds.cc:180
+#: dselect/basecmds.cc
 msgid "Help: "
 msgstr "Pomocník: "
 
-#: dselect/basecmds.cc:186
+#: dselect/basecmds.cc
 msgid "Press ? for help menu, . for next topic, <space> to exit help."
 msgstr ""
 "Menu pomocníka zobrazíte stlačením ?, ďalšiu tému ., Pomocníka ukončíte "
 "<medzerník>."
 
-#: dselect/basecmds.cc:193
+#: dselect/basecmds.cc
 msgid "Help information is available under the following topics:"
 msgstr "Pomocník je dostupný pre nasledujúce témy: "
 
-#: dselect/basecmds.cc:201
+#: dselect/basecmds.cc
 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. "
@@ -50,239 +50,239 @@ msgstr ""
 "Pomocníka,\n"
 "  alebo „.“ (bodka) na postupné čítanie všetkých stránok Pomocníka."
 
-#: dselect/basecmds.cc:207
+#: dselect/basecmds.cc
 msgid "error reading keyboard in help"
 msgstr "chyba pri čítaní klávesnice v Pomocníkovi"
 
-#: dselect/baselist.cc:60
+#: dselect/baselist.cc
 msgid "ioctl(TIOCGWINSZ) failed"
 msgstr "zlyhala funkcia ioctl(TIOCGWINSZ)"
 
-#: dselect/baselist.cc:63
+#: dselect/baselist.cc
 msgid "doupdate in SIGWINCH handler failed"
 msgstr "zlyhala funkcia doupdate v obsluhe SIGWINCH"
 
-#: dselect/baselist.cc:72
+#: dselect/baselist.cc
 msgid "failed to restore old SIGWINCH sigact"
 msgstr "zlyhalo obnovenie starého SIGWINCH sigact"
 
-#: dselect/baselist.cc:75
+#: dselect/baselist.cc
 msgid "failed to restore old signal mask"
 msgstr "zlyhalo obnovenie starej masky signálu"
 
-#: dselect/baselist.cc:86
+#: dselect/baselist.cc
 msgid "failed to get old signal mask"
 msgstr "zlyhalo získanie starej masky signálu"
 
-#: dselect/baselist.cc:88
+#: dselect/baselist.cc
 msgid "failed to get old SIGWINCH sigact"
 msgstr "zlyhalo získanie starého SIGWINCH sigact"
 
-#: dselect/baselist.cc:93
+#: dselect/baselist.cc
 msgid "failed to block SIGWINCH"
 msgstr "nepodarilo sa zablokovať SIGWINCH"
 
-#: dselect/baselist.cc:99
+#: dselect/baselist.cc
 msgid "failed to set new SIGWINCH sigact"
 msgstr "zlyhalo nastavenie nového SIGWINCH spracovania signálu"
 
-#: dselect/baselist.cc:174
+#: dselect/baselist.cc
 msgid "failed to allocate colour pair"
 msgstr "nepodarilo sa alokovať farebný pár"
 
-#: dselect/baselist.cc:203
+#: dselect/baselist.cc
 msgid "failed to create title window"
 msgstr "zlyhalo vytvorenie titulného okna"
 
-#: dselect/baselist.cc:207
+#: dselect/baselist.cc
 msgid "failed to create whatinfo window"
 msgstr "zlyhalo vytvorenie informačného okna"
 
-#: dselect/baselist.cc:211
+#: dselect/baselist.cc
 msgid "failed to create baselist pad"
 msgstr "zlyhalo vytvorenie okna základného zoznamu"
 
-#: dselect/baselist.cc:214
+#: dselect/baselist.cc
 msgid "failed to create heading pad"
 msgstr "zlyhalo vytvorenie hlavičkového okna"
 
-#: dselect/baselist.cc:218
+#: dselect/baselist.cc
 msgid "failed to create thisstate pad"
 msgstr "zlyhalo vytvorenie stavového okna"
 
-#: dselect/baselist.cc:222
+#: dselect/baselist.cc
 msgid "failed to create info pad"
 msgstr "zlyhalo vytvorenie informačného okna"
 
-#: dselect/baselist.cc:227
+#: dselect/baselist.cc
 msgid "failed to create query window"
 msgstr "zlyhalo vytvorenie dopytovacieho okna"
 
-#: dselect/baselist.cc:298
+#: dselect/baselist.cc
 msgid "Keybindings"
 msgstr "Väzby klávesov"
 
-#: dselect/baselist.cc:347
+#: dselect/baselist.cc
 #, c-format
 msgid "  -- %d%%, press "
 msgstr " -- %d%%, stlačte "
 
-#: dselect/baselist.cc:350
+#: dselect/baselist.cc
 #, c-format
 msgid "%s for more"
 msgstr "%s pre viac"
 
-#: dselect/baselist.cc:354
+#: dselect/baselist.cc
 #, c-format
 msgid "%s to go back"
 msgstr "%s pre návrat späť"
 
-#: dselect/bindings.cc:78
+#: dselect/bindings.cc
 msgid "[not bound]"
 msgstr "[nenaviazaný]"
 
-#: dselect/bindings.cc:82
+#: dselect/bindings.cc
 #, c-format
 msgid "[unk: %d]"
 msgstr "[unk: %d]"
 
-#: dselect/bindings.cc:141
+#: dselect/bindings.cc
 msgid "Scroll onwards through help/information"
 msgstr "Posun pomocníka/informáciami ďalej"
 
-#: dselect/bindings.cc:142
+#: dselect/bindings.cc
 msgid "Scroll backwards through help/information"
 msgstr "Posun pomocníka/informáciami späť"
 
-#: dselect/bindings.cc:143
+#: dselect/bindings.cc
 msgid "Move up"
 msgstr "Posun hore"
 
-#: dselect/bindings.cc:144
+#: dselect/bindings.cc
 msgid "Move down"
 msgstr "Posun dolu"
 
-#: dselect/bindings.cc:145
+#: dselect/bindings.cc
 msgid "Go to top of list"
 msgstr "Prejsť na začiatok zoznamu"
 
-#: dselect/bindings.cc:146
+#: dselect/bindings.cc
 msgid "Go to end of list"
 msgstr "Prejsť na koniec zoznamu"
 
-#: dselect/bindings.cc:147
+#: dselect/bindings.cc
 msgid "Request help (cycle through help screens)"
 msgstr "Vyžiadať pomoc (pohyb naprieč oknami Pomocníka)"
 
-#: dselect/bindings.cc:148
+#: dselect/bindings.cc
 msgid "Cycle through information displays"
 msgstr "Pohyb naprieč informačnými obrazovkami"
 
-#: dselect/bindings.cc:149
+#: dselect/bindings.cc
 msgid "Redraw display"
 msgstr "Prekresliť obrazovku"
 
-#: dselect/bindings.cc:150
+#: dselect/bindings.cc
 msgid "Scroll onwards through list by 1 line"
 msgstr "Posun zoznamom o jeden riadok vpred"
 
-#: dselect/bindings.cc:151
+#: dselect/bindings.cc
 msgid "Scroll backwards through list by 1 line"
 msgstr "Posun zoznamom o jeden riadok späť"
 
-#: dselect/bindings.cc:152
+#: dselect/bindings.cc
 msgid "Scroll onwards through help/information by 1 line"
 msgstr "Posun v nápovede/informáciách o jeden riadok vpred"
 
-#: dselect/bindings.cc:153
+#: dselect/bindings.cc
 msgid "Scroll backwards through help/information by 1 line"
 msgstr "Posun v Pomocníkovi/informáciách o jeden riadok späť"
 
-#: dselect/bindings.cc:154
+#: dselect/bindings.cc
 msgid "Scroll onwards through list"
 msgstr "Posun zoznamom dopredu"
 
-#: dselect/bindings.cc:155
+#: dselect/bindings.cc
 msgid "Scroll backwards through list"
 msgstr "Posun zoznamom dozadu"
 
-#: dselect/bindings.cc:158
+#: dselect/bindings.cc
 msgid "Mark package(s) for installation"
 msgstr "Označiť balík(y) na inštaláciu"
 
-#: dselect/bindings.cc:159
+#: dselect/bindings.cc
 msgid "Mark package(s) for deinstallation"
 msgstr "Označiť balík(y) na odinštalovanie"
 
-#: dselect/bindings.cc:160
+#: dselect/bindings.cc
 msgid "Mark package(s) for deinstall and purge"
 msgstr "Označiť balík(y) na odinštalovanie a vyčistenie"
 
-#: dselect/bindings.cc:161
+#: dselect/bindings.cc
 msgid "Make highlight more specific"
 msgstr "Upresniť zvýraznenie"
 
-#: dselect/bindings.cc:162
+#: dselect/bindings.cc
 msgid "Make highlight less specific"
 msgstr "Rozšíriť zvýraznenie"
 
-#: dselect/bindings.cc:163
+#: dselect/bindings.cc
 msgid "Search for a package whose name contains a string"
 msgstr "Hľadať balík, ktorého názov obsahuje reťazec"
 
-#: dselect/bindings.cc:164
+#: dselect/bindings.cc
 msgid "Repeat last search"
 msgstr "Zopakovať posledné hľadanie"
 
-#: dselect/bindings.cc:165
+#: dselect/bindings.cc
 msgid "Swap sort order priority/section"
 msgstr "Zmena triedenia podľa priority/sekcie"
 
-#: dselect/bindings.cc:166
+#: dselect/bindings.cc
 msgid "Quit, confirming, and checking dependencies"
 msgstr "Ukončenie, potvrdenie, a kontrola závislostí"
 
-#: dselect/bindings.cc:167
+#: dselect/bindings.cc
 msgid "Quit, confirming without check"
 msgstr "Ukončenie, potvrdenie bez kontroly"
 
-#: dselect/bindings.cc:168
+#: dselect/bindings.cc
 msgid "Quit, rejecting conflict/dependency suggestions"
 msgstr "Ukončenie, zamietnutie návrhov riešenia konfliktov/závislostí"
 
-#: dselect/bindings.cc:169
+#: dselect/bindings.cc
 msgid "Abort - quit without making changes"
 msgstr "Zrušenie - ukončenie práce bezo zmien"
 
-#: dselect/bindings.cc:170
+#: dselect/bindings.cc
 msgid "Revert to old state for all packages"
 msgstr "Návrat do starého stavu pre všetky balíky"
 
-#: dselect/bindings.cc:171
+#: dselect/bindings.cc
 msgid "Revert to suggested state for all packages"
 msgstr "Návrat do navrhovaného stavu pre všetky balíky"
 
-#: dselect/bindings.cc:172
+#: dselect/bindings.cc
 msgid "Revert to directly requested state for all packages"
 msgstr "Návrat do priamo požadovaného stavu pre všetky balíky"
 
-#: dselect/bindings.cc:173
+#: dselect/bindings.cc
 msgid "Revert to currently installed state for all packages"
 msgstr "Návrat do momentálne nainštalovaného stavu pre všetky balíky"
 
-#: dselect/bindings.cc:176
+#: dselect/bindings.cc
 msgid "Select currently-highlighted access method"
 msgstr "Výber aktuálne označenej prístupovej metódy"
 
-#: dselect/bindings.cc:177
+#: dselect/bindings.cc
 msgid "Quit without changing selected access method"
 msgstr "Ukončenie bez zmeny zvolenej výberovej metódy"
 
-#: dselect/helpmsgs.cc:29
+#: dselect/helpmsgs.cc
 msgid "Keystrokes"
 msgstr "Funkcie klávesov"
 
-#: dselect/helpmsgs.cc:29
+#: dselect/helpmsgs.cc
 #, fuzzy
 #| msgid ""
 #| "Motion keys: Next/Previous, Top/End, Up/Down, Backwards/Forwards:\n"
@@ -380,11 +380,11 @@ msgstr ""
 "   D     nastaviť všetko na priamo požadovaný stav      n, \\ opakovať "
 "posledné vyhľadávanie\n"
 
-#: dselect/helpmsgs.cc:55
+#: dselect/helpmsgs.cc
 msgid "Introduction to package selections"
 msgstr "Úvod do výberov balíkov"
 
-#: dselect/helpmsgs.cc:55
+#: dselect/helpmsgs.cc
 msgid ""
 "Welcome to dselect's main package listing.\n"
 "\n"
@@ -442,11 +442,11 @@ msgstr ""
 "\n"
 "Pomocníka ukončíte a do zoznamu vstúpite stlačením <medzerník>.\n"
 
-#: dselect/helpmsgs.cc:80
+#: dselect/helpmsgs.cc
 msgid "Introduction to read-only package list browser"
 msgstr "Úvod k prehliadaču zoznamu balíkov len pre čítanie"
 
-#: dselect/helpmsgs.cc:80
+#: dselect/helpmsgs.cc
 msgid ""
 "Welcome to dselect's main package listing.\n"
 "\n"
@@ -485,11 +485,11 @@ msgstr ""
 "Pomocníka ukončíte  a späť na zoznam sa vrátite stlačením klávesu "
 "<medzerník>.\n"
 
-#: dselect/helpmsgs.cc:99
+#: dselect/helpmsgs.cc
 msgid "Introduction to conflict/dependency resolution sub-list"
 msgstr "Úvod k podzoznamu riešení konfliktov/závislostí"
 
-#: dselect/helpmsgs.cc:99
+#: dselect/helpmsgs.cc
 msgid ""
 "Dependency/conflict resolution - introduction.\n"
 "\n"
@@ -555,11 +555,11 @@ msgstr ""
 "Pomocníka opustíte a do podzoznamu sa vrátite stlačením <medzerník>; "
 "pamätajte: Pomocníka vyvoláte stlačením „?“.\n"
 
-#: dselect/helpmsgs.cc:125
+#: dselect/helpmsgs.cc
 msgid "Display, part 1: package listing and status chars"
 msgstr "Zobrazenie, časť 1: zoznam balíkov a znaky stavov"
 
-#: dselect/helpmsgs.cc:125
+#: dselect/helpmsgs.cc
 msgid ""
 "The top half of the screen shows a list of packages.  For each package you "
 "see\n"
@@ -621,11 +621,11 @@ msgstr ""
 "dostupné čísla verzií pre každý balík (zobrazenie/skrytie pomocou shift-V) a "
 "sumárny popis.\n"
 
-#: dselect/helpmsgs.cc:152
+#: dselect/helpmsgs.cc
 msgid "Display, part 2: list highlight; information display"
 msgstr "Zobrazenie, časť 2: zoznam zvýraznení; informačná obrazovka"
 
-#: dselect/helpmsgs.cc:152
+#: dselect/helpmsgs.cc
 msgid ""
 "* Highlight: One line in the package list will be highlighted.  It "
 "indicates\n"
@@ -675,11 +675,11 @@ msgstr ""
 "  informačnej obrazovky alebo na jej zväčšenie na takmer celú veľkosť "
 "obrazovky.\n"
 
-#: dselect/helpmsgs.cc:176
+#: dselect/helpmsgs.cc
 msgid "Introduction to method selection display"
 msgstr "Úvod do zobrazenia výberu metódy"
 
-#: dselect/helpmsgs.cc:176
+#: dselect/helpmsgs.cc
 msgid ""
 "dselect and dpkg can do automatic installation, loading the package files to "
 "be\n"
@@ -723,11 +723,11 @@ msgstr ""
 "alebo z menu\n"
 "Pomocníka, ktorú je možné získať stlačením klávesu „?“.\n"
 
-#: dselect/helpmsgs.cc:196
+#: dselect/helpmsgs.cc
 msgid "Keystrokes for method selection"
 msgstr "Klávesy na výber metódy"
 
-#: dselect/helpmsgs.cc:196
+#: dselect/helpmsgs.cc
 msgid ""
 "Motion keys: Next/Previous, Top/End, Up/Down, Backwards/Forwards:\n"
 "  j, Down-arrow         k, Up-arrow             move highlight\n"
@@ -775,104 +775,104 @@ msgstr ""
 "  /                vyhľadanie (stlačením Enter zrušíte operáciu)\n"
 "  \\               zopakuje posledné hľadanie\n"
 
-#: dselect/main.cc:63
+#: dselect/main.cc
 msgid "Type dselect --help for help."
 msgstr "Pomocníka vyvoláte príkazom „dselect --help“."
 
-#: dselect/main.cc:145
+#: dselect/main.cc
 msgid "a"
 msgstr "p"
 
-#: dselect/main.cc:145
+#: dselect/main.cc
 msgid "[A]ccess"
 msgstr "[P]rístup"
 
-#: dselect/main.cc:145
+#: dselect/main.cc
 msgid "Choose the access method to use."
 msgstr "Vyberte si prístupovú metódu."
 
-#: dselect/main.cc:146
+#: dselect/main.cc
 msgid "u"
 msgstr "a"
 
-#: dselect/main.cc:146
+#: dselect/main.cc
 msgid "[U]pdate"
 msgstr "[A]ktualizácia"
 
-#: dselect/main.cc:146
+#: dselect/main.cc
 msgid "Update list of available packages, if possible."
 msgstr "Aktualizujte zoznam dostupných balíkov, ak je to možné."
 
-#: dselect/main.cc:147
+#: dselect/main.cc
 msgid "s"
 msgstr "v"
 
-#: dselect/main.cc:147
+#: dselect/main.cc
 msgid "[S]elect"
 msgstr "[V]ýber "
 
-#: dselect/main.cc:147
+#: dselect/main.cc
 msgid "Request which packages you want on your system."
 msgstr "Vyžiadajte, ktoré balíky chcete vo vašom systéme."
 
-#: dselect/main.cc:148
+#: dselect/main.cc
 msgid "i"
 msgstr "n"
 
-#: dselect/main.cc:148
+#: dselect/main.cc
 msgid "[I]nstall"
 msgstr "[N]ainštalovať"
 
-#: dselect/main.cc:148
+#: dselect/main.cc
 msgid "Install and upgrade wanted packages."
 msgstr "Nainštalovať a aktualizovať požadované balíky."
 
-#: dselect/main.cc:149
+#: dselect/main.cc
 msgid "c"
 msgstr "k"
 
-#: dselect/main.cc:149
+#: dselect/main.cc
 msgid "[C]onfig"
 msgstr "[K]onfigurovať"
 
-#: dselect/main.cc:149
+#: dselect/main.cc
 msgid "Configure any packages that are unconfigured."
 msgstr "Konfigurovať všetky nenakonfigurované balíky."
 
-#: dselect/main.cc:150
+#: dselect/main.cc
 msgid "r"
 msgstr "o"
 
-#: dselect/main.cc:150
+#: dselect/main.cc
 msgid "[R]emove"
 msgstr "[O]dstrániť"
 
-#: dselect/main.cc:150
+#: dselect/main.cc
 msgid "Remove unwanted software."
 msgstr "Odstrániť nechcený softvér."
 
-#: dselect/main.cc:151
+#: dselect/main.cc
 msgid "q"
 msgstr "u"
 
-#: dselect/main.cc:151
+#: dselect/main.cc
 msgid "[Q]uit"
 msgstr "[U]končiť"
 
-#: dselect/main.cc:151
+#: dselect/main.cc
 msgid "Quit dselect."
 msgstr "Ukončiť dselect."
 
-#: dselect/main.cc:152
+#: dselect/main.cc
 msgid "menu"
 msgstr "menu"
 
-#: dselect/main.cc:157
+#: dselect/main.cc
 #, c-format
 msgid "Debian `%s' package handling frontend version %s.\n"
 msgstr "Debian „%s“ - rozhranie na správu balíkov, verzia %s.\n"
 
-#: dselect/main.cc:160
+#: dselect/main.cc
 msgid ""
 "This is free software; see the GNU General Public License version 2 or\n"
 "later for copying conditions. There is NO warranty.\n"
@@ -881,29 +881,47 @@ msgstr ""
 "nájdete v GNU General Public License verzii 2 alebo neskoršej.\n"
 "Neposkytuje sa ŽIADNA záruka.\n"
 
-#: dselect/main.cc:169 dselect/main.cc:217
+#: dselect/main.cc
 msgid "<standard output>"
 msgstr "<štandardný výstup>"
 
-#: dselect/main.cc:180
-#, c-format
+#: dselect/main.cc
+#, fuzzy, c-format
+#| msgid ""
+#| "Usage: %s [<option> ...] [<action> ...]\n"
+#| "\n"
 msgid ""
-"Usage: %s [<option> ...] [<action> ...]\n"
+"Usage: %s [<option>...] [<command>...]\n"
 "\n"
 msgstr ""
 "Použitie: %s [<voľba> ...] [<operácia> ...]\n"
 "\n"
 
-#: dselect/main.cc:184
+#: dselect/main.cc
 #, c-format
+msgid "Commands:\n"
+msgstr ""
+
+#: dselect/main.cc
+#, fuzzy, c-format
+#| msgid ""
+#| "Options:\n"
+#| "  --admindir <directory>     Use <directory> instead of %s.\n"
+#| "  --expert                   Turn on expert mode.\n"
+#| "  --debug <file> | -D<file>  Turn on debugging, sending output to "
+#| "<file>.\n"
+#| "  --colour | --color screenpart:[foreground],[background][:attr[+attr"
+#| "+...]]\n"
+#| "                             Configure screen colours.\n"
+#| "\n"
 msgid ""
 "Options:\n"
-"  --admindir <directory>     Use <directory> instead of %s.\n"
-"  --expert                   Turn on expert mode.\n"
-"  --debug <file> | -D<file>  Turn on debugging, sending output to <file>.\n"
-"  --colour | --color screenpart:[foreground],[background][:attr[+attr+...]]\n"
-"                             Configure screen colours.\n"
-"\n"
+"      --admindir <directory>       Use <directory> instead of %s.\n"
+"      --expert                     Turn on expert mode.\n"
+"  -D, --debug <file>               Turn on debugging, send output to "
+"<file>.\n"
+"      --color <color-spec>         Configure screen colors.\n"
+"      --colour <color-spec>        Ditto.\n"
 msgstr ""
 "Voľby:\n"
 "  --admindir <adresár>         Použije <adresár> namiesto %s.\n"
@@ -914,72 +932,79 @@ msgstr ""
 "                               Nastaví farby obrazovky.\n"
 "\n"
 
-#: dselect/main.cc:193
-#, c-format
+#: dselect/main.cc
+#, fuzzy, c-format
+#| msgid ""
+#| "  --help                     Show this help message.\n"
+#| "  --version                  Show the version.\n"
+#| "\n"
 msgid ""
-"  --help                     Show this help message.\n"
-"  --version                  Show the version.\n"
+"  -?, --help                       Show this help message.\n"
+"      --version                    Show the version.\n"
 "\n"
 msgstr ""
 "  --help                     Zobrazí tento text Pomocníka.\n"
 "  --version                  Zobrazí číslo verzie.\n"
 "\n"
 
-#: dselect/main.cc:197
+#: dselect/main.cc
 #, c-format
-msgid "Actions:\n"
-msgstr "Operácie:\n"
+msgid ""
+"<color-spec> is <screen-part>:[<foreground>],[<background>][:"
+"<attr>[+<attr>]...]\n"
+msgstr ""
 
-#: dselect/main.cc:202
-#, c-format
-msgid "Screenparts:\n"
+#: dselect/main.cc
+#, fuzzy, c-format
+#| msgid "Screenparts:\n"
+msgid "<screen-part> is:"
 msgstr "Časti obrazovky:\n"
 
-#: dselect/main.cc:207
+#: dselect/main.cc
 #, c-format
-msgid "Colours:\n"
-msgstr "Farby:\n"
+msgid "<color> is:"
+msgstr ""
 
-#: dselect/main.cc:212
+#: dselect/main.cc
 #, c-format
-msgid "Attributes:\n"
-msgstr "Vlastnosti:\n"
+msgid "<attr> is:"
+msgstr ""
 
-#: dselect/main.cc:232
+#: dselect/main.cc
 #, c-format
 msgid "couldn't open debug file `%.255s'\n"
 msgstr "nebolo možné otvoriť ladiaci súbor „%.255s“\n"
 
-#: dselect/main.cc:253
+#: dselect/main.cc
 #, c-format
 msgid "invalid %s '%s'"
 msgstr "neplatný %s „%s“"
 
-#: dselect/main.cc:272
+#: dselect/main.cc
 msgid "screen part"
 msgstr "časť obrazovky"
 
-#: dselect/main.cc:278
+#: dselect/main.cc
 msgid "null colour specification"
 msgstr "žiadna špecifikácia farby"
 
-#: dselect/main.cc:286 dselect/main.cc:291
+#: dselect/main.cc
 msgid "colour"
 msgstr "farba"
 
-#: dselect/main.cc:299
+#: dselect/main.cc
 msgid "colour attribute"
 msgstr "vlastnosť farby"
 
-#: dselect/main.cc:333
+#: dselect/main.cc
 msgid "Terminal does not appear to support cursor addressing.\n"
 msgstr "Terminál zdá sa nepodporuje adresovanie kurzoru.\n"
 
-#: dselect/main.cc:335
+#: dselect/main.cc
 msgid "Terminal does not appear to support highlighting.\n"
 msgstr "Nezdá sa, že by terminál podporoval zvýraznenie.\n"
 
-#: dselect/main.cc:337
+#: dselect/main.cc
 #, c-format
 msgid ""
 "Set your TERM variable correctly, use a better terminal,\n"
@@ -988,11 +1013,11 @@ msgstr ""
 "Nastavte vašu premennú TERM správne, použite lepší terminál,\n"
 "alebo to urobte pomocou nástroja na správu jednotlivých balíkov %s.\n"
 
-#: dselect/main.cc:340
+#: dselect/main.cc
 msgid "terminal lacks necessary features, giving up"
 msgstr "terminálu chýbajú nevyhnutné zložky, ukončuje sa"
 
-#: dselect/main.cc:425
+#: dselect/main.cc
 msgid ""
 "\n"
 "\n"
@@ -1007,7 +1032,7 @@ msgstr ""
 "Výber potvrdíte stlačením <Enter>. ^L prekreslí obrazovku.\n"
 "\n"
 
-#: dselect/main.cc:430
+#: dselect/main.cc
 msgid ""
 "Copyright (C) 1994-1996 Ian Jackson.\n"
 "Copyright (C) 2000,2001 Wichert Akkerman.\n"
@@ -1015,7 +1040,7 @@ msgstr ""
 "Copyright (C) 1994-1996 Ian Jackson.\n"
 "Copyright (C) 2000,2001 Wichert Akkerman.\n"
 
-#: dselect/main.cc:436
+#: dselect/main.cc
 msgid ""
 "\n"
 "\n"
@@ -1025,57 +1050,57 @@ msgstr ""
 "\n"
 "Prístup len na čítanie: možný je len prehľad výberov!"
 
-#: dselect/main.cc:455
+#: dselect/main.cc
 msgid "failed to getch in main menu"
 msgstr "zlyhala funkcia getch v hlavnom menu"
 
-#: dselect/main.cc:538
+#: dselect/main.cc
 #, c-format
 msgid "unknown action string `%.50s'"
 msgstr "neznámy reťazec operácie „%.50s“"
 
-#: dselect/methlist.cc:66
+#: dselect/methlist.cc
 msgid "Abbrev."
 msgstr "Skrát."
 
-#: dselect/methlist.cc:67 dselect/pkgdisplay.cc:188 dselect/pkginfo.cc:110
+#: dselect/methlist.cc dselect/pkgdisplay.cc dselect/pkginfo.cc
 msgid "Description"
 msgstr "Popis"
 
-#: dselect/methlist.cc:73
+#: dselect/methlist.cc
 msgid "dselect - list of access methods"
 msgstr "dselect - zoznam prístupových metód"
 
-#: dselect/methlist.cc:82
+#: dselect/methlist.cc
 #, c-format
 msgid "Access method `%s'."
 msgstr "Prístupová metóda „%s“."
 
-#: dselect/methlist.cc:161 dselect/pkglist.cc:587
+#: dselect/methlist.cc dselect/pkglist.cc
 msgid "doupdate failed"
 msgstr "funkcia doupdate zlyhala"
 
-#: dselect/methlist.cc:164 dselect/pkglist.cc:590
+#: dselect/methlist.cc dselect/pkglist.cc
 msgid "failed to unblock SIGWINCH"
 msgstr "zlyhalo odblokovanie premennej SIGWINCH"
 
-#: dselect/methlist.cc:169 dselect/pkglist.cc:595
+#: dselect/methlist.cc dselect/pkglist.cc
 msgid "failed to re-block SIGWINCH"
 msgstr "zlyhalo opätovné zablokovanie premennej SIGWINCH"
 
-#: dselect/methlist.cc:170 dselect/pkglist.cc:597
+#: dselect/methlist.cc dselect/pkglist.cc
 msgid "getch failed"
 msgstr "funkcia getch zlyhala"
 
-#: dselect/methlist.cc:187
+#: dselect/methlist.cc
 msgid "Explanation"
 msgstr "Vysvetlenie"
 
-#: dselect/methlist.cc:197
+#: dselect/methlist.cc
 msgid "No explanation available."
 msgstr "Nie je dostupné žiadne vysvetlenie."
 
-#: dselect/method.cc:67
+#: dselect/method.cc
 #, c-format
 msgid ""
 "\n"
@@ -1086,7 +1111,7 @@ msgstr ""
 "\n"
 "%s: %s\n"
 
-#: dselect/method.cc:70
+#: dselect/method.cc
 msgid ""
 "\n"
 "Press <enter> to continue."
@@ -1094,191 +1119,201 @@ msgstr ""
 "\n"
 "Pokračujte stlačením <Enter>."
 
-#: dselect/method.cc:82
+#: dselect/method.cc
 msgid "cannot unlock access method area"
 msgstr ""
 
-#: dselect/method.cc:96
+#: dselect/method.cc
 #, fuzzy
 #| msgid " does not appear to be available\n"
 msgid "no access methods are available"
 msgstr " nevyzerá byť dostupný\n"
 
-#: dselect/method.cc:115
+#: dselect/method.cc
 msgid "requested operation requires superuser privilege"
 msgstr ""
 
-#: dselect/method.cc:118
+#: dselect/method.cc
 #, fuzzy
 #| msgid "Choose the access method to use."
 msgid "cannot open or create access method lockfile"
 msgstr "Vyberte si prístupovú metódu."
 
-#: dselect/method.cc:125
+#: dselect/method.cc
 msgid "the access method area is already locked"
 msgstr ""
 
-#: dselect/method.cc:128
+#: dselect/method.cc
 #, fuzzy
 #| msgid "dselect - list of access methods"
 msgid "cannot lock access method area"
 msgstr "dselect - zoznam prístupových metód"
 
-#: dselect/method.cc:161
+#: dselect/method.cc
 #, c-format
 msgid "Press <enter> to continue.\n"
 msgstr "Pokračujte stlačením klávesu <Enter>.\n"
 
-#: dselect/method.cc:162
+#: dselect/method.cc
 msgid "<standard error>"
 msgstr "<štandardný chybový výstup>"
 
-#: dselect/method.cc:165
+#: dselect/method.cc
 msgid "error reading acknowledgement of program failure message"
 msgstr "chyba pri čítaní potvrdenia správy o zlyhaní programu"
 
-#: dselect/method.cc:187
+#: dselect/method.cc
 msgid "no access method is selected or configured"
 msgstr ""
 
-#: dselect/method.cc:196
+#: dselect/method.cc
 msgid "update available list script"
 msgstr "aktualizácia dostupného skriptu zoznamu"
 
-#: dselect/method.cc:200
+#: dselect/method.cc
 msgid "installation script"
 msgstr "inštalačný skript"
 
-#: dselect/method.cc:246
+#: dselect/method.cc
 msgid "query/setup script"
 msgstr "dotazovací/nastavovací skript"
 
-#: dselect/methparse.cc:53
+#: dselect/methparse.cc
 #, c-format
 msgid "syntax error in method options file `%.250s' -- %s"
 msgstr "syntaktická chyba v metóde súboru volieb „%.250s“ -- %s"
 
-#: dselect/methparse.cc:59
+#: dselect/methparse.cc
 #, c-format
 msgid "error reading options file `%.250s'"
 msgstr "chyba pri čítaní súboru volieb „%.250s“"
 
-#: dselect/methparse.cc:93
+#: dselect/methparse.cc
 #, c-format
 msgid "unable to read `%.250s' directory for reading methods"
 msgstr "nie je možné čítať metódy čítania z adresára „%.250s“"
 
-#: dselect/methparse.cc:109
+#: dselect/methparse.cc
 #, c-format
 msgid "method `%.250s' has name that is too long (%d > %d characters)"
 msgstr "metóda „%.250s“ má názov, ktorý je príliš dlhý (%d > %d znakov) "
 
-#: dselect/methparse.cc:120
+#: dselect/methparse.cc
 #, c-format
 msgid "unable to access method script `%.250s'"
 msgstr "nie je možné pristupovať k skriptu metódy „%.250s“"
 
-#: dselect/methparse.cc:126
+#: dselect/methparse.cc
 #, c-format
 msgid "unable to read method options file `%.250s'"
 msgstr "nie je možné čítať súbor volieb metód „%.250s“"
 
-#: dselect/methparse.cc:150
+#: dselect/methparse.cc
 msgid "non-digit where digit wanted"
 msgstr "nečíselná hodnota tam, kde je očakávané číslo"
 
-#: dselect/methparse.cc:153
-msgid "EOF in index string"
+#: dselect/methparse.cc
+#, fuzzy
+#| msgid "EOF in index string"
+msgid "end of file in index string"
 msgstr "EOF v indexovacom reťazci"
 
-#: dselect/methparse.cc:156
+#: dselect/methparse.cc
 msgid "index string too long"
 msgstr "indexovací reťazec je príliš dlhý"
 
-#: dselect/methparse.cc:159
+#: dselect/methparse.cc
 msgid "newline before option name start"
 msgstr "nový riadok pred začiatkom názvu voľby"
 
-#: dselect/methparse.cc:161
-msgid "EOF before option name start"
-msgstr "EOF pred začiatkom názvu voľby"
+#: dselect/methparse.cc
+#, fuzzy
+#| msgid "newline before option name start"
+msgid "end of file before option name start"
+msgstr "nový riadok pred začiatkom názvu voľby"
 
-#: dselect/methparse.cc:165
+#: dselect/methparse.cc
 msgid "nonalpha where option name start wanted"
 msgstr "nealfanumerický znak tam, kde sa očakáva začiatok názvu voľby"
 
-#: dselect/methparse.cc:167
+#: dselect/methparse.cc
 msgid "non-alphanum in option name"
 msgstr "nealfanumerický znak v názve voľby"
 
-#: dselect/methparse.cc:170
-msgid "EOF in option name"
+#: dselect/methparse.cc
+#, fuzzy
+#| msgid "EOF in option name"
+msgid "end of file in option name"
 msgstr "EOF v názve voľby"
 
-#: dselect/methparse.cc:175
+#: dselect/methparse.cc
 msgid "newline before summary"
 msgstr "nový riadok pred prehľadom"
 
-#: dselect/methparse.cc:177
-msgid "EOF before summary"
-msgstr "EOF pred prehľadom"
+#: dselect/methparse.cc
+#, fuzzy
+#| msgid "newline before summary"
+msgid "end of file before summary"
+msgstr "nový riadok pred prehľadom"
 
-#: dselect/methparse.cc:183
-msgid "EOF in summary - missing newline"
+#: dselect/methparse.cc
+#, fuzzy
+#| msgid "EOF in summary - missing newline"
+msgid "end of file in summary - missing newline"
 msgstr "EOF v prehľade - chýbajúci nový riadok"
 
-#: dselect/methparse.cc:193
+#: dselect/methparse.cc
 #, c-format
 msgid "unable to open option description file `%.250s'"
 msgstr "nie je možné otvoriť voľbu popisu súboru „%.250s“"
 
-#: dselect/methparse.cc:197
+#: dselect/methparse.cc
 #, c-format
 msgid "unable to stat option description file `%.250s'"
 msgstr "nie je možné zistiť stav voľby popisu súboru „%.250s“"
 
-#: dselect/methparse.cc:201
+#: dselect/methparse.cc
 #, c-format
 msgid "failed to read option description file `%.250s'"
 msgstr "zlyhalo načítanie popisného súboru volieb „%.250s“"
 
-#: dselect/methparse.cc:204
+#: dselect/methparse.cc
 #, c-format
 msgid "error during read of option description file `%.250s'"
 msgstr "chyba pri čítaní popisného súboru volieb „%.250s“"
 
-#: dselect/methparse.cc:227
+#: dselect/methparse.cc
 #, c-format
 msgid "error during read of method options file `%.250s'"
 msgstr "chyba pri čítaní súboru s voľbami metód „%.250s“"
 
-#: dselect/methparse.cc:250
+#: dselect/methparse.cc
 #, c-format
 msgid "unable to open current option file `%.250s'"
 msgstr "nie je možné otvoriť aktuálny súbor s voľbami „%.250s“"
 
-#: dselect/methparse.cc:286
+#: dselect/methparse.cc
 #, c-format
 msgid "unable to write new option to `%.250s'"
 msgstr "nie je možné zapísať nové voľby do „%.255s“"
 
-#: dselect/pkgdisplay.cc:36
+#: dselect/pkgdisplay.cc
 msgid "new package"
 msgstr "nový balík"
 
-#: dselect/pkgdisplay.cc:37
+#: dselect/pkgdisplay.cc
 msgid "install"
 msgstr "nainštalovať"
 
-#: dselect/pkgdisplay.cc:38
+#: dselect/pkgdisplay.cc
 msgid "hold"
 msgstr "podržať"
 
-#: dselect/pkgdisplay.cc:39
+#: dselect/pkgdisplay.cc
 msgid "remove"
 msgstr "odstrániť"
 
-#: dselect/pkgdisplay.cc:40
+#: dselect/pkgdisplay.cc
 msgid "purge"
 msgstr "vyčistiť"
 
@@ -1286,331 +1321,325 @@ msgstr "vyčistiť"
 #. * the empty string to store information about the translation. DO NOT
 #. * CHANGE THAT IN A TRANSLATION! The code really relies on that being
 #. * a single space.
-#: dselect/pkgdisplay.cc:47
+#: dselect/pkgdisplay.cc
 msgid " "
 msgstr " "
 
-#: dselect/pkgdisplay.cc:48
+#: dselect/pkgdisplay.cc
 msgid "REINSTALL"
 msgstr "PREINŠTALOVAŤ"
 
-#: dselect/pkgdisplay.cc:51
+#: dselect/pkgdisplay.cc
 msgid "not installed"
 msgstr "nenainštalovaný"
 
-#: dselect/pkgdisplay.cc:52
+#: dselect/pkgdisplay.cc
 msgid "removed (configs remain)"
 msgstr "odstránený (konfigurácie ponechané)"
 
-#: dselect/pkgdisplay.cc:53
+#: dselect/pkgdisplay.cc
 msgid "half installed"
 msgstr "čiastočne nainštalovaný"
 
-#: dselect/pkgdisplay.cc:54
+#: dselect/pkgdisplay.cc
 msgid "unpacked (not set up)"
 msgstr "rozbalený (nenakonfigurovaný)"
 
-#: dselect/pkgdisplay.cc:55
+#: dselect/pkgdisplay.cc
 msgid "half configured (config failed)"
 msgstr "polo-nakonfigurovaný (konfigurácia zlyhala)"
 
-#: dselect/pkgdisplay.cc:56
+#: dselect/pkgdisplay.cc
 msgid "awaiting trigger processing"
 msgstr "čaká sa na spracovanie spúšťačov (triggers-awaited)"
 
-#: dselect/pkgdisplay.cc:57
+#: dselect/pkgdisplay.cc
 msgid "triggered"
 msgstr "spustené"
 
-#: dselect/pkgdisplay.cc:58
+#: dselect/pkgdisplay.cc
 msgid "installed"
 msgstr "nainštalovaný"
 
-#: dselect/pkgdisplay.cc:61
+#: dselect/pkgdisplay.cc
 msgid "Required"
 msgstr "Vyžadovaný"
 
-#: dselect/pkgdisplay.cc:62
+#: dselect/pkgdisplay.cc
 msgid "Important"
 msgstr "Dôležitý"
 
-#: dselect/pkgdisplay.cc:63
+#: dselect/pkgdisplay.cc
 msgid "Standard"
 msgstr "Štandardný"
 
-#: dselect/pkgdisplay.cc:64
+#: dselect/pkgdisplay.cc
 msgid "Optional"
 msgstr "Voliteľný"
 
-#: dselect/pkgdisplay.cc:65
+#: dselect/pkgdisplay.cc
 msgid "Extra"
 msgstr "Extra"
 
-#: dselect/pkgdisplay.cc:66
-msgid "!Bug!"
-msgstr "!Chyba!"
-
-#: dselect/pkgdisplay.cc:67
+#: dselect/pkgdisplay.cc
 msgid "Unclassified"
 msgstr "Neklasifikovaný"
 
-#: dselect/pkgdisplay.cc:70
+#: dselect/pkgdisplay.cc
 msgid "suggests"
 msgstr "navrhuje"
 
-#: dselect/pkgdisplay.cc:71
+#: dselect/pkgdisplay.cc
 msgid "recommends"
 msgstr "odporúča"
 
-#: dselect/pkgdisplay.cc:72
+#: dselect/pkgdisplay.cc
 msgid "depends on"
 msgstr "závisí na"
 
-#: dselect/pkgdisplay.cc:73
+#: dselect/pkgdisplay.cc
 msgid "pre-depends on"
 msgstr "pred-závisí na"
 
-#: dselect/pkgdisplay.cc:74
+#: dselect/pkgdisplay.cc
 msgid "breaks"
 msgstr "kazí"
 
-#: dselect/pkgdisplay.cc:75
+#: dselect/pkgdisplay.cc
 msgid "conflicts with"
 msgstr "v konflite s"
 
-#: dselect/pkgdisplay.cc:76
+#: dselect/pkgdisplay.cc
 msgid "provides"
 msgstr "poskytuje"
 
-#: dselect/pkgdisplay.cc:77
+#: dselect/pkgdisplay.cc
 msgid "replaces"
 msgstr "nahrádza"
 
-#: dselect/pkgdisplay.cc:78
+#: dselect/pkgdisplay.cc
 msgid "enhances"
 msgstr "vylepšuje"
 
-#: dselect/pkgdisplay.cc:81
+#: dselect/pkgdisplay.cc
 msgid "Req"
 msgstr "Vyž"
 
-#: dselect/pkgdisplay.cc:82
+#: dselect/pkgdisplay.cc
 msgid "Imp"
 msgstr "Dôl"
 
-#: dselect/pkgdisplay.cc:83
+#: dselect/pkgdisplay.cc
 msgid "Std"
 msgstr "Šta"
 
-#: dselect/pkgdisplay.cc:84
+#: dselect/pkgdisplay.cc
 msgid "Opt"
 msgstr "Vol"
 
-#: dselect/pkgdisplay.cc:85
+#: dselect/pkgdisplay.cc
 msgid "Xtr"
 msgstr "Xtr"
 
-#: dselect/pkgdisplay.cc:86
+#: dselect/pkgdisplay.cc
 msgid "bUG"
 msgstr "Chy"
 
-#: dselect/pkgdisplay.cc:87
+#: dselect/pkgdisplay.cc
 msgid "?"
 msgstr "?"
 
-#: dselect/pkgdisplay.cc:95 dselect/pkgdisplay.cc:115
+#: dselect/pkgdisplay.cc
 msgid "Broken"
 msgstr "Poškodený"
 
-#: dselect/pkgdisplay.cc:96
+#: dselect/pkgdisplay.cc
 msgid "New"
 msgstr "Nový"
 
-#: dselect/pkgdisplay.cc:97
-msgid "Updated"
-msgstr "Aktualizovaný"
+#: dselect/pkgdisplay.cc
+msgid "Upgradable"
+msgstr ""
 
-#: dselect/pkgdisplay.cc:98
+#: dselect/pkgdisplay.cc
 msgid "Obsolete/local"
 msgstr "Zastaralý/lokálny"
 
-#: dselect/pkgdisplay.cc:99
-msgid "Up-to-date"
-msgstr "Aktuálny"
+#: dselect/pkgdisplay.cc
+msgid "Installed"
+msgstr "Nainštalované"
 
-#: dselect/pkgdisplay.cc:100
+#: dselect/pkgdisplay.cc
 msgid "Available"
 msgstr "Dostupný"
 
-#: dselect/pkgdisplay.cc:101 dselect/pkgdisplay.cc:117
+#: dselect/pkgdisplay.cc
 msgid "Removed"
 msgstr "Odstránený"
 
-#: dselect/pkgdisplay.cc:102 dselect/pkgdisplay.cc:111
+#: dselect/pkgdisplay.cc
 msgid "Brokenly installed packages"
 msgstr "Chybne nainštalované balíky"
 
-#: dselect/pkgdisplay.cc:103
+#: dselect/pkgdisplay.cc
 msgid "Newly available packages"
 msgstr "Novo dostupné balíky"
 
-#: dselect/pkgdisplay.cc:104
-msgid "Updated packages (newer version is available)"
-msgstr "Aktualizované balíky (k dispozícii je novšia verzia)"
+#: dselect/pkgdisplay.cc
+#, fuzzy
+#| msgid "Newly available packages"
+msgid "Upgradable packages"
+msgstr "Novo dostupné balíky"
 
-#: dselect/pkgdisplay.cc:105
-msgid "Obsolete and local packages present on system"
+#: dselect/pkgdisplay.cc
+#, fuzzy
+#| msgid "Obsolete and local packages present on system"
+msgid "Obsolete and locally created packages"
 msgstr "Zastaralé a lokálne balíky v systéme"
 
-#: dselect/pkgdisplay.cc:106
-msgid "Up to date installed packages"
-msgstr "Aktuálne nainštalované balíky"
+#: dselect/pkgdisplay.cc
+msgid "Installed packages"
+msgstr "Nainštalované balíky"
 
-#: dselect/pkgdisplay.cc:107
-msgid "Available packages (not currently installed)"
-msgstr "Dostupné balíky (momentálne nenainštalované)"
+#: dselect/pkgdisplay.cc
+#, fuzzy
+#| msgid "Up to date installed packages"
+msgid "Available not installed packages"
+msgstr "Aktuálne nainštalované balíky"
 
-#: dselect/pkgdisplay.cc:108
+#: dselect/pkgdisplay.cc
 msgid "Removed and no longer available packages"
 msgstr "Odstránené a viac nedostupné balíky"
 
-#: dselect/pkgdisplay.cc:112
-msgid "Installed packages"
-msgstr "Nainštalované balíky"
-
-#: dselect/pkgdisplay.cc:113
+#: dselect/pkgdisplay.cc
 msgid "Removed packages (configuration still present)"
 msgstr "Odstránené balíky (konfigurácia stále zachovaná)"
 
-#: dselect/pkgdisplay.cc:114
+#: dselect/pkgdisplay.cc
 msgid "Purged packages and those never installed"
 msgstr "Vyčistené a nikdy nenainštalované balíky"
 
-#: dselect/pkgdisplay.cc:116
-msgid "Installed"
-msgstr "Nainštalované"
-
-#: dselect/pkgdisplay.cc:118
+#: dselect/pkgdisplay.cc
 msgid "Purged"
 msgstr "Vyčistené"
 
-#: dselect/pkgdisplay.cc:138
+#: dselect/pkgdisplay.cc
 msgid "Error"
 msgstr "Chyba"
 
-#: dselect/pkgdisplay.cc:139
+#: dselect/pkgdisplay.cc
 msgid "Installed?"
 msgstr "Nainštalovaný?"
 
-#: dselect/pkgdisplay.cc:140
+#: dselect/pkgdisplay.cc
 msgid "Old mark"
 msgstr "Stará značka"
 
-#: dselect/pkgdisplay.cc:141
+#: dselect/pkgdisplay.cc
 msgid "Marked for"
 msgstr "Označené na"
 
-#: dselect/pkgdisplay.cc:143
+#: dselect/pkgdisplay.cc
 msgid "EIOM"
 msgstr "EIOM"
 
-#: dselect/pkgdisplay.cc:147 dselect/pkgdisplay.cc:150
+#: dselect/pkgdisplay.cc
 msgid "Section"
 msgstr "Sekcia"
 
-#: dselect/pkgdisplay.cc:148
+#: dselect/pkgdisplay.cc
 msgid "Priority"
 msgstr "Priorita"
 
-#: dselect/pkgdisplay.cc:152
+#: dselect/pkgdisplay.cc
 msgid "Package"
 msgstr "Balík"
 
-#: dselect/pkgdisplay.cc:161 dselect/pkgdisplay.cc:165
+#: dselect/pkgdisplay.cc
 #, fuzzy
 #| msgid "Avail.ver"
 msgid "Avail.arch"
 msgstr "Dostup.ver"
 
-#: dselect/pkgdisplay.cc:164
+#: dselect/pkgdisplay.cc
 #, fuzzy
 #| msgid "Inst.ver"
 msgid "Inst.arch"
 msgstr "Inšt.ver"
 
-#: dselect/pkgdisplay.cc:178 dselect/pkgdisplay.cc:182
+#: dselect/pkgdisplay.cc
 msgid "Avail.ver"
 msgstr "Dostup.ver"
 
-#: dselect/pkgdisplay.cc:181
+#: dselect/pkgdisplay.cc
 msgid "Inst.ver"
 msgstr "Inšt.ver"
 
-#: dselect/pkgdisplay.cc:197
+#: dselect/pkgdisplay.cc
 msgid "dselect - recursive package listing"
 msgstr "dselect - rekurzívny výpis balíkov"
 
-#: dselect/pkgdisplay.cc:199
+#: dselect/pkgdisplay.cc
 msgid "dselect - inspection of package states"
 msgstr "dselect - inšpekcia stavov balíkov"
 
-#: dselect/pkgdisplay.cc:200
+#: dselect/pkgdisplay.cc
 msgid "dselect - main package listing"
 msgstr "dselect - hlavný zoznam balíkov"
 
-#: dselect/pkgdisplay.cc:208
+#: dselect/pkgdisplay.cc
 msgid " (by section)"
 msgstr " (podľa sekcie)"
 
-#: dselect/pkgdisplay.cc:211
+#: dselect/pkgdisplay.cc
 msgid " (avail., section)"
 msgstr " (dostup., sekcia)"
 
-#: dselect/pkgdisplay.cc:214
+#: dselect/pkgdisplay.cc
 msgid " (status, section)"
 msgstr " (stav, sekcia)"
 
-#: dselect/pkgdisplay.cc:223
+#: dselect/pkgdisplay.cc
 msgid " (by priority)"
 msgstr " (podľa priority)"
 
-#: dselect/pkgdisplay.cc:226
+#: dselect/pkgdisplay.cc
 msgid " (avail., priority)"
 msgstr " (dostup., priorita)"
 
-#: dselect/pkgdisplay.cc:229
+#: dselect/pkgdisplay.cc
 msgid " (status, priority)"
 msgstr " (stav, priorita)"
 
-#: dselect/pkgdisplay.cc:238
+#: dselect/pkgdisplay.cc
 msgid " (alphabetically)"
 msgstr " (abecedne)"
 
-#: dselect/pkgdisplay.cc:241
+#: dselect/pkgdisplay.cc
 msgid " (by availability)"
 msgstr " (podľa dostupnosti)"
 
-#: dselect/pkgdisplay.cc:244
+#: dselect/pkgdisplay.cc
 msgid " (by status)"
 msgstr " (podľa stavu)"
 
-#: dselect/pkgdisplay.cc:259
+#: dselect/pkgdisplay.cc
 msgid " mark:+/=/- terse:v help:?"
 msgstr " znač.:+/=/- struč:v Pomocník:? "
 
-#: dselect/pkgdisplay.cc:260
+#: dselect/pkgdisplay.cc
 msgid " mark:+/=/- verbose:v help:?"
 msgstr " znač.:+/=/- podrob:v Pomocník:?"
 
-#: dselect/pkgdisplay.cc:262
+#: dselect/pkgdisplay.cc
 msgid " terse:v help:?"
 msgstr " stručne:v Pomocník:?"
 
-#: dselect/pkgdisplay.cc:263
+#: dselect/pkgdisplay.cc
 msgid " verbose:v help:?"
 msgstr " podrobne:v Pomocník:?"
 
-#: dselect/pkginfo.cc:85
+#: dselect/pkginfo.cc
 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 "
@@ -1630,80 +1659,110 @@ msgstr ""
 "Môžete použiť „o“ a „O“ na zmenu zoradenia a umožniť tak označenie balíkov z "
 "iných skupín."
 
-#: dselect/pkginfo.cc:98
+#: dselect/pkginfo.cc
 msgid "Interrelationships"
 msgstr "Závislosti"
 
-#: dselect/pkginfo.cc:117
+#: dselect/pkginfo.cc
 msgid "No description available."
 msgstr "Popis nie je dostupný."
 
-#: dselect/pkginfo.cc:135
+#: dselect/pkginfo.cc
 msgid "Installed control file information"
 msgstr "Informácie nainštalovaného riadiaceho súboru"
 
-#: dselect/pkginfo.cc:151
+#: dselect/pkginfo.cc
 msgid "Available control file information"
 msgstr "Dostupné informácie o riadiacom súbore"
 
-#: dselect/pkglist.cc:425
+#: dselect/pkglist.cc
 msgid "there are no packages"
 msgstr "žiadne balíky"
 
-#: dselect/pkglist.cc:521
+#: dselect/pkglist.cc
 msgid "invalid search option given"
 msgstr "zadaná nesprávna podmienka vyhľadávania"
 
-#: dselect/pkglist.cc:536
+#: dselect/pkglist.cc
 msgid "error in regular expression"
 msgstr "chyba v regulárnom výraze"
 
-#: dselect/pkgsublist.cc:111
+#: dselect/pkgsublist.cc
 msgid " does not appear to be available\n"
 msgstr " nevyzerá byť dostupný\n"
 
-#: dselect/pkgsublist.cc:131
+#: dselect/pkgsublist.cc
 msgid " or "
 msgstr " alebo "
 
-#: dselect/pkgtop.cc:58
+#: dselect/pkgtop.cc
 msgid "All"
 msgstr "Všetky"
 
-#: dselect/pkgtop.cc:80
+#: dselect/pkgtop.cc
 msgid "All packages"
 msgstr "Všetky balíky"
 
-#: dselect/pkgtop.cc:84
+#: dselect/pkgtop.cc
 #, c-format
 msgid "%s packages without a section"
 msgstr "%s balíky bez sekcie"
 
-#: dselect/pkgtop.cc:86
+#: dselect/pkgtop.cc
 #, c-format
 msgid "%s packages in section %s"
 msgstr "%s balíkov v sekcii %s"
 
-#: dselect/pkgtop.cc:92
+#: dselect/pkgtop.cc
 #, c-format
 msgid "%s %s packages"
 msgstr "%s %s balíky"
 
-#: dselect/pkgtop.cc:96
+#: dselect/pkgtop.cc
 #, c-format
 msgid "%s %s packages without a section"
 msgstr "%s %s balíky bez sekcie"
 
-#: dselect/pkgtop.cc:98
+#: dselect/pkgtop.cc
 #, c-format
 msgid "%s %s packages in section %s"
 msgstr " %s %s balíky v sekcii %s"
 
-#: dselect/pkgtop.cc:119
+#: dselect/pkgtop.cc
 #, c-format
 msgid "%-*s %s%s%s;  %s (was: %s).  %s"
 msgstr "%-*s %s%s%s; %s (bolo: %s).  %s"
 
+#~ msgid "Actions:\n"
+#~ msgstr "Operácie:\n"
+
+#~ msgid "Colours:\n"
+#~ msgstr "Farby:\n"
+
+#~ msgid "Attributes:\n"
+#~ msgstr "Vlastnosti:\n"
+
+#~ msgid "EOF before option name start"
+#~ msgstr "EOF pred začiatkom názvu voľby"
+
+#~ msgid "EOF before summary"
+#~ msgstr "EOF pred prehľadom"
+
+#~ msgid "!Bug!"
+#~ msgstr "!Chyba!"
+
+#~ msgid "Updated"
+#~ msgstr "Aktualizovaný"
+
+#~ msgid "Up-to-date"
+#~ msgstr "Aktuálny"
+
+#~ msgid "Updated packages (newer version is available)"
+#~ msgstr "Aktualizované balíky (k dispozícii je novšia verzia)"
+
+#~ msgid "Available packages (not currently installed)"
+#~ msgstr "Dostupné balíky (momentálne nenainštalované)"
+
 #~ msgid "foreign architectures enabled but multi-arch is not supported"
 #~ msgstr "cudzie architectúry sú zapnuté, ale multi-arch nie je podporovaný"
 
diff --git a/dselect/po/sv.po b/dselect/po/sv.po
index c95cbc561..33f933ca3 100644
--- a/dselect/po/sv.po
+++ b/dselect/po/sv.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dselect 1.17.22\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2014-12-23 18:12+0100\n"
+"POT-Creation-Date: 2015-04-06 09:37+0200\n"
 "PO-Revision-Date: 2014-10-30 15:07+0100\n"
 "Last-Translator: Peter Krefting <peter@softwolves.pp.se>\n"
 "Language-Team: Svenska <debian-l10n-swedish@lists.debian.org>\n"
@@ -17,27 +17,27 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: dselect/basecmds.cc:125
+#: dselect/basecmds.cc
 msgid "Search for ? "
 msgstr "Sök efter? "
 
-#: dselect/basecmds.cc:149
+#: dselect/basecmds.cc
 msgid "Error: "
 msgstr "Fel: "
 
-#: dselect/basecmds.cc:180
+#: dselect/basecmds.cc
 msgid "Help: "
 msgstr "Hjälp: "
 
-#: dselect/basecmds.cc:186
+#: dselect/basecmds.cc
 msgid "Press ? for help menu, . for next topic, <space> to exit help."
 msgstr "Tryck ? för hjälpmenyn, . för nästa ämne, <blanksteg> lämnar hjälpen."
 
-#: dselect/basecmds.cc:193
+#: dselect/basecmds.cc
 msgid "Help information is available under the following topics:"
 msgstr "Hjälpinformation finns för följande ämnen:"
 
-#: dselect/basecmds.cc:201
+#: dselect/basecmds.cc
 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. "
@@ -46,239 +46,239 @@ msgstr ""
 "hjälpen,\n"
 "  eller \".\" (punkt) för att läsa hjälpsidorna i sekvens. "
 
-#: dselect/basecmds.cc:207
+#: dselect/basecmds.cc
 msgid "error reading keyboard in help"
 msgstr "fel vid läsning av tangentbordet i hjälpfunktionen"
 
-#: dselect/baselist.cc:60
+#: dselect/baselist.cc
 msgid "ioctl(TIOCGWINSZ) failed"
 msgstr "ioctl(TIOCGWINSZ) misslyckades"
 
-#: dselect/baselist.cc:63
+#: dselect/baselist.cc
 msgid "doupdate in SIGWINCH handler failed"
 msgstr "doupdate misslyckades i hanterare för fönsterändring"
 
-#: dselect/baselist.cc:72
+#: dselect/baselist.cc
 msgid "failed to restore old SIGWINCH sigact"
 msgstr "kunde inte återställa tidigare fönsteruppdateringshanterare"
 
-#: dselect/baselist.cc:75
+#: dselect/baselist.cc
 msgid "failed to restore old signal mask"
 msgstr "kunde inte återställa gammal signalmask"
 
-#: dselect/baselist.cc:86
+#: dselect/baselist.cc
 msgid "failed to get old signal mask"
 msgstr "kunde inte hämta gammal signalmask"
 
-#: dselect/baselist.cc:88
+#: dselect/baselist.cc
 msgid "failed to get old SIGWINCH sigact"
 msgstr "kunde inte hämta tidigare fönsteruppdateringshanterare"
 
-#: dselect/baselist.cc:93
+#: dselect/baselist.cc
 msgid "failed to block SIGWINCH"
 msgstr "kunde inte blockera fönsterändring"
 
-#: dselect/baselist.cc:99
+#: dselect/baselist.cc
 msgid "failed to set new SIGWINCH sigact"
 msgstr "kunde inte sätta ny fönsteruppdateringshanterare"
 
-#: dselect/baselist.cc:174
+#: dselect/baselist.cc
 msgid "failed to allocate colour pair"
 msgstr "kunde allokera färgpar"
 
-#: dselect/baselist.cc:203
+#: dselect/baselist.cc
 msgid "failed to create title window"
 msgstr "kunde inte skapa titelfönster"
 
-#: dselect/baselist.cc:207
+#: dselect/baselist.cc
 msgid "failed to create whatinfo window"
 msgstr "kunde inte skapa informationfönster"
 
-#: dselect/baselist.cc:211
+#: dselect/baselist.cc
 msgid "failed to create baselist pad"
 msgstr "kunde inte skapa baslisteflik"
 
-#: dselect/baselist.cc:214
+#: dselect/baselist.cc
 msgid "failed to create heading pad"
 msgstr "kunde inte skapa rubrikflik"
 
-#: dselect/baselist.cc:218
+#: dselect/baselist.cc
 msgid "failed to create thisstate pad"
 msgstr "kunde inte skapa \"detta tillstånd\"-flik"
 
-#: dselect/baselist.cc:222
+#: dselect/baselist.cc
 msgid "failed to create info pad"
 msgstr "kunde inte skapa informationsflik"
 
-#: dselect/baselist.cc:227
+#: dselect/baselist.cc
 msgid "failed to create query window"
 msgstr "kunde inte skapa frågefönster"
 
-#: dselect/baselist.cc:298
+#: dselect/baselist.cc
 msgid "Keybindings"
 msgstr "Tangentbindningar"
 
-#: dselect/baselist.cc:347
+#: dselect/baselist.cc
 #, c-format
 msgid "  -- %d%%, press "
 msgstr "  -- %d%%, tryck "
 
-#: dselect/baselist.cc:350
+#: dselect/baselist.cc
 #, c-format
 msgid "%s for more"
 msgstr "%s för mer"
 
-#: dselect/baselist.cc:354
+#: dselect/baselist.cc
 #, c-format
 msgid "%s to go back"
 msgstr "%s återgår"
 
-#: dselect/bindings.cc:78
+#: dselect/bindings.cc
 msgid "[not bound]"
 msgstr "[ej funnet]"
 
-#: dselect/bindings.cc:82
+#: dselect/bindings.cc
 #, c-format
 msgid "[unk: %d]"
 msgstr "[okänd: %d]"
 
-#: dselect/bindings.cc:141
+#: dselect/bindings.cc
 msgid "Scroll onwards through help/information"
 msgstr "Rulla framåt genom hjälp/information"
 
-#: dselect/bindings.cc:142
+#: dselect/bindings.cc
 msgid "Scroll backwards through help/information"
 msgstr "Rulla bakåt genom hjälp/information"
 
-#: dselect/bindings.cc:143
+#: dselect/bindings.cc
 msgid "Move up"
 msgstr "Gå upp"
 
-#: dselect/bindings.cc:144
+#: dselect/bindings.cc
 msgid "Move down"
 msgstr "Gå ner"
 
-#: dselect/bindings.cc:145
+#: dselect/bindings.cc
 msgid "Go to top of list"
 msgstr "Gå till listans början"
 
-#: dselect/bindings.cc:146
+#: dselect/bindings.cc
 msgid "Go to end of list"
 msgstr "Gå till listans slut"
 
-#: dselect/bindings.cc:147
+#: dselect/bindings.cc
 msgid "Request help (cycle through help screens)"
 msgstr "Be om hjälp (gå genom hjälpskärmarna)"
 
-#: dselect/bindings.cc:148
+#: dselect/bindings.cc
 msgid "Cycle through information displays"
 msgstr "Gå genom informationsvisningarna"
 
-#: dselect/bindings.cc:149
+#: dselect/bindings.cc
 msgid "Redraw display"
 msgstr "Rita om bilden"
 
-#: dselect/bindings.cc:150
+#: dselect/bindings.cc
 msgid "Scroll onwards through list by 1 line"
 msgstr "Rulla fram listan en rad"
 
-#: dselect/bindings.cc:151
+#: dselect/bindings.cc
 msgid "Scroll backwards through list by 1 line"
 msgstr "Rulla tillbaka listan en rad"
 
-#: dselect/bindings.cc:152
+#: dselect/bindings.cc
 msgid "Scroll onwards through help/information by 1 line"
 msgstr "Rullafram hjälpen/informationen en rad"
 
-#: dselect/bindings.cc:153
+#: dselect/bindings.cc
 msgid "Scroll backwards through help/information by 1 line"
 msgstr "Rulla tillbaka hjälpen/informationen en rad"
 
-#: dselect/bindings.cc:154
+#: dselect/bindings.cc
 msgid "Scroll onwards through list"
 msgstr "Rulla framåt genom listan"
 
-#: dselect/bindings.cc:155
+#: dselect/bindings.cc
 msgid "Scroll backwards through list"
 msgstr "Rulla bakåt genom listan"
 
-#: dselect/bindings.cc:158
+#: dselect/bindings.cc
 msgid "Mark package(s) for installation"
 msgstr "Markera paket för installation"
 
-#: dselect/bindings.cc:159
+#: dselect/bindings.cc
 msgid "Mark package(s) for deinstallation"
 msgstr "Markera paket för avinstallation"
 
-#: dselect/bindings.cc:160
+#: dselect/bindings.cc
 msgid "Mark package(s) for deinstall and purge"
 msgstr "Markera paket för avinstallation och radering"
 
-#: dselect/bindings.cc:161
+#: dselect/bindings.cc
 msgid "Make highlight more specific"
 msgstr "Gör markering mer specifik"
 
-#: dselect/bindings.cc:162
+#: dselect/bindings.cc
 msgid "Make highlight less specific"
 msgstr "Gör markering mindre specifik"
 
-#: dselect/bindings.cc:163
+#: dselect/bindings.cc
 msgid "Search for a package whose name contains a string"
 msgstr "Sök efter paket vars namn innehåller en sträng"
 
-#: dselect/bindings.cc:164
+#: dselect/bindings.cc
 msgid "Repeat last search"
 msgstr "Repetera senaste sökning"
 
-#: dselect/bindings.cc:165
+#: dselect/bindings.cc
 msgid "Swap sort order priority/section"
 msgstr "Byt sorteringsordning prioritet/sektion"
 
-#: dselect/bindings.cc:166
+#: dselect/bindings.cc
 msgid "Quit, confirming, and checking dependencies"
 msgstr "Avsluta bekräftande och kontrollera beroenden"
 
-#: dselect/bindings.cc:167
+#: dselect/bindings.cc
 msgid "Quit, confirming without check"
 msgstr "Avsluta bekräftande utan kontroll"
 
-#: dselect/bindings.cc:168
+#: dselect/bindings.cc
 msgid "Quit, rejecting conflict/dependency suggestions"
 msgstr "Avsluta och strunta i förslagen"
 
-#: dselect/bindings.cc:169
+#: dselect/bindings.cc
 msgid "Abort - quit without making changes"
 msgstr "Avbryt - sluta utan att ändra"
 
-#: dselect/bindings.cc:170
+#: dselect/bindings.cc
 msgid "Revert to old state for all packages"
 msgstr "Återgå till tidigare tillstånd för alla paket"
 
-#: dselect/bindings.cc:171
+#: dselect/bindings.cc
 msgid "Revert to suggested state for all packages"
 msgstr "Återgå till föreslagna tillstånd för alla paket"
 
-#: dselect/bindings.cc:172
+#: dselect/bindings.cc
 msgid "Revert to directly requested state for all packages"
 msgstr "Återgå till direkt föreslagna tillstånd för alla paket"
 
-#: dselect/bindings.cc:173
+#: dselect/bindings.cc
 msgid "Revert to currently installed state for all packages"
 msgstr "Återgå till nuvarande installerat tillstånd för alla paket"
 
-#: dselect/bindings.cc:176
+#: dselect/bindings.cc
 msgid "Select currently-highlighted access method"
 msgstr "Välj nu markerad åtkomstmetod"
 
-#: dselect/bindings.cc:177
+#: dselect/bindings.cc
 msgid "Quit without changing selected access method"
 msgstr "Avsluta utan att ändra vald åtkomstmetod"
 
-#: dselect/helpmsgs.cc:29
+#: dselect/helpmsgs.cc
 msgid "Keystrokes"
 msgstr "Tangenter"
 
-#: dselect/helpmsgs.cc:29
+#: dselect/helpmsgs.cc
 msgid ""
 "Motion keys: Next/Previous, Top/End, Up/Down, Backwards/Forwards:\n"
 "  j, Down-arrow         k, Up-arrow             move highlight\n"
@@ -336,11 +336,11 @@ msgstr ""
 "   D     Sätt alla till önskat tillstånd      n, \\  repetera senaste "
 "sökningen\n"
 
-#: dselect/helpmsgs.cc:55
+#: dselect/helpmsgs.cc
 msgid "Introduction to package selections"
 msgstr "Introduktion till paketvalen"
 
-#: dselect/helpmsgs.cc:55
+#: dselect/helpmsgs.cc
 msgid ""
 "Welcome to dselect's main package listing.\n"
 "\n"
@@ -398,11 +398,11 @@ msgstr ""
 "\n"
 "Tryck <Blanksteg> för att lämna hjälpen och gå till listan nu.\n"
 
-#: dselect/helpmsgs.cc:80
+#: dselect/helpmsgs.cc
 msgid "Introduction to read-only package list browser"
 msgstr "Introduktion till den skrivskyddade paketlistebläddraren"
 
-#: dselect/helpmsgs.cc:80
+#: dselect/helpmsgs.cc
 msgid ""
 "Welcome to dselect's main package listing.\n"
 "\n"
@@ -440,11 +440,11 @@ msgstr ""
 "\n"
 "Tryck <Blanksteg> för att lämna hjälpen och gå till listan nu.\n"
 
-#: dselect/helpmsgs.cc:99
+#: dselect/helpmsgs.cc
 msgid "Introduction to conflict/dependency resolution sub-list"
 msgstr "Introduktion till konflikt-/beroendehanteringsunderlistan"
 
-#: dselect/helpmsgs.cc:99
+#: dselect/helpmsgs.cc
 msgid ""
 "Dependency/conflict resolution - introduction.\n"
 "\n"
@@ -509,11 +509,11 @@ msgstr ""
 "ihåg:\n"
 "tryck \"?\" för hjälp.\n"
 
-#: dselect/helpmsgs.cc:125
+#: dselect/helpmsgs.cc
 msgid "Display, part 1: package listing and status chars"
 msgstr "Visning, del 1: paketlistning och statussymboler"
 
-#: dselect/helpmsgs.cc:125
+#: dselect/helpmsgs.cc
 msgid ""
 "The top half of the screen shows a list of packages.  For each package you "
 "see\n"
@@ -576,11 +576,11 @@ msgstr ""
 "Varje pakets prioritet, sektion, namn, installerad och tillgänglig version\n"
 "(skift-V för att visa/dölja) och sammanfattad beskrivning visas också.\n"
 
-#: dselect/helpmsgs.cc:152
+#: dselect/helpmsgs.cc
 msgid "Display, part 2: list highlight; information display"
 msgstr "Visning, del 2: listmarkering, informationsvisning"
 
-#: dselect/helpmsgs.cc:152
+#: dselect/helpmsgs.cc
 msgid ""
 "* Highlight: One line in the package list will be highlighted.  It "
 "indicates\n"
@@ -634,11 +634,11 @@ msgstr ""
 "nästan\n"
 "  hela skärmen.\n"
 
-#: dselect/helpmsgs.cc:176
+#: dselect/helpmsgs.cc
 msgid "Introduction to method selection display"
 msgstr "Introduktion till metodvalsskärmen"
 
-#: dselect/helpmsgs.cc:176
+#: dselect/helpmsgs.cc
 msgid ""
 "dselect and dpkg can do automatic installation, loading the package files to "
 "be\n"
@@ -680,11 +680,11 @@ msgstr ""
 "eller\n"
 "från hjälpmenyn du når genom att trycka \"?\".\n"
 
-#: dselect/helpmsgs.cc:196
+#: dselect/helpmsgs.cc
 msgid "Keystrokes for method selection"
 msgstr "Tangenter för metodval"
 
-#: dselect/helpmsgs.cc:196
+#: dselect/helpmsgs.cc
 msgid ""
 "Motion keys: Next/Previous, Top/End, Up/Down, Backwards/Forwards:\n"
 "  j, Down-arrow         k, Up-arrow             move highlight\n"
@@ -729,104 +729,104 @@ msgstr ""
 "  /             sök (Enter avbryter)\n"
 "  \\             repetera senaste sökning\n"
 
-#: dselect/main.cc:63
+#: dselect/main.cc
 msgid "Type dselect --help for help."
 msgstr "Skriv dselect --help för hjälp."
 
-#: dselect/main.cc:145
+#: dselect/main.cc
 msgid "a"
 msgstr "k"
 
-#: dselect/main.cc:145
+#: dselect/main.cc
 msgid "[A]ccess"
 msgstr "Åt[k]omst"
 
-#: dselect/main.cc:145
+#: dselect/main.cc
 msgid "Choose the access method to use."
 msgstr "Välj använd åtkomstmetod."
 
-#: dselect/main.cc:146
+#: dselect/main.cc
 msgid "u"
 msgstr "u"
 
-#: dselect/main.cc:146
+#: dselect/main.cc
 msgid "[U]pdate"
 msgstr "[U]ppdatera"
 
-#: dselect/main.cc:146
+#: dselect/main.cc
 msgid "Update list of available packages, if possible."
 msgstr "Uppdatera listan över tillgängliga paket, om möjligt."
 
-#: dselect/main.cc:147
+#: dselect/main.cc
 msgid "s"
 msgstr "v"
 
-#: dselect/main.cc:147
+#: dselect/main.cc
 msgid "[S]elect"
 msgstr "[V]älj"
 
-#: dselect/main.cc:147
+#: dselect/main.cc
 msgid "Request which packages you want on your system."
 msgstr "Välj paket du vill ha på ditt system."
 
-#: dselect/main.cc:148
+#: dselect/main.cc
 msgid "i"
 msgstr "i"
 
-#: dselect/main.cc:148
+#: dselect/main.cc
 msgid "[I]nstall"
 msgstr "[I]nstallera"
 
-#: dselect/main.cc:148
+#: dselect/main.cc
 msgid "Install and upgrade wanted packages."
 msgstr "Installera och uppgradera önskade paket."
 
-#: dselect/main.cc:149
+#: dselect/main.cc
 msgid "c"
 msgstr "k"
 
-#: dselect/main.cc:149
+#: dselect/main.cc
 msgid "[C]onfig"
 msgstr "[K]onfigurera"
 
-#: dselect/main.cc:149
+#: dselect/main.cc
 msgid "Configure any packages that are unconfigured."
 msgstr "Konfigurera paket som ännu ej konfigurerats."
 
-#: dselect/main.cc:150
+#: dselect/main.cc
 msgid "r"
 msgstr "r"
 
-#: dselect/main.cc:150
+#: dselect/main.cc
 msgid "[R]emove"
 msgstr "[R]adera"
 
-#: dselect/main.cc:150
+#: dselect/main.cc
 msgid "Remove unwanted software."
 msgstr "Ta bort oönskad programvara."
 
-#: dselect/main.cc:151
+#: dselect/main.cc
 msgid "q"
 msgstr "a"
 
-#: dselect/main.cc:151
+#: dselect/main.cc
 msgid "[Q]uit"
 msgstr "[A]vsluta"
 
-#: dselect/main.cc:151
+#: dselect/main.cc
 msgid "Quit dselect."
 msgstr "Lämnar dselect."
 
-#: dselect/main.cc:152
+#: dselect/main.cc
 msgid "menu"
 msgstr "meny"
 
-#: dselect/main.cc:157
+#: dselect/main.cc
 #, c-format
 msgid "Debian `%s' package handling frontend version %s.\n"
 msgstr "Debian \"%s\" pakethanteringsgränssnitt version %s.\n"
 
-#: dselect/main.cc:160
+#: dselect/main.cc
 msgid ""
 "This is free software; see the GNU General Public License version 2 or\n"
 "later for copying conditions. There is NO warranty.\n"
@@ -834,29 +834,47 @@ msgstr ""
 "Detta program är fri programvara. Se GNU General Public License version 2\n"
 "eller senare för kopieringsvillkor. Det finns INGEN garanti.\n"
 
-#: dselect/main.cc:169 dselect/main.cc:217
+#: dselect/main.cc
 msgid "<standard output>"
 msgstr "<standard ut>"
 
-#: dselect/main.cc:180
-#, c-format
+#: dselect/main.cc
+#, fuzzy, c-format
+#| msgid ""
+#| "Usage: %s [<option> ...] [<action> ...]\n"
+#| "\n"
 msgid ""
-"Usage: %s [<option> ...] [<action> ...]\n"
+"Usage: %s [<option>...] [<command>...]\n"
 "\n"
 msgstr ""
 "Användning: %s [<flagga> ...] [<åtgärd> ...]\n"
 "\n"
 
-#: dselect/main.cc:184
+#: dselect/main.cc
 #, c-format
+msgid "Commands:\n"
+msgstr ""
+
+#: dselect/main.cc
+#, fuzzy, c-format
+#| msgid ""
+#| "Options:\n"
+#| "  --admindir <directory>     Use <directory> instead of %s.\n"
+#| "  --expert                   Turn on expert mode.\n"
+#| "  --debug <file> | -D<file>  Turn on debugging, sending output to "
+#| "<file>.\n"
+#| "  --colour | --color screenpart:[foreground],[background][:attr[+attr"
+#| "+...]]\n"
+#| "                             Configure screen colours.\n"
+#| "\n"
 msgid ""
 "Options:\n"
-"  --admindir <directory>     Use <directory> instead of %s.\n"
-"  --expert                   Turn on expert mode.\n"
-"  --debug <file> | -D<file>  Turn on debugging, sending output to <file>.\n"
-"  --colour | --color screenpart:[foreground],[background][:attr[+attr+...]]\n"
-"                             Configure screen colours.\n"
-"\n"
+"      --admindir <directory>       Use <directory> instead of %s.\n"
+"      --expert                     Turn on expert mode.\n"
+"  -D, --debug <file>               Turn on debugging, send output to "
+"<file>.\n"
+"      --color <color-spec>         Configure screen colors.\n"
+"      --colour <color-spec>        Ditto.\n"
 msgstr ""
 "Flaggor:\n"
 "  --admindir <katalog>       Använd <katalog> istället för %s.\n"
@@ -866,72 +884,79 @@ msgstr ""
 "                             Konfigurera skärmfärger.\n"
 "\n"
 
-#: dselect/main.cc:193
-#, c-format
+#: dselect/main.cc
+#, fuzzy, c-format
+#| msgid ""
+#| "  --help                     Show this help message.\n"
+#| "  --version                  Show the version.\n"
+#| "\n"
 msgid ""
-"  --help                     Show this help message.\n"
-"  --version                  Show the version.\n"
+"  -?, --help                       Show this help message.\n"
+"      --version                    Show the version.\n"
 "\n"
 msgstr ""
 "  --help                     Visa detta hjälpmeddelande.\n"
 "  --version                  Visa versionsnummer.\n"
 "\n"
 
-#: dselect/main.cc:197
+#: dselect/main.cc
 #, c-format
-msgid "Actions:\n"
-msgstr "Åtgärder:\n"
+msgid ""
+"<color-spec> is <screen-part>:[<foreground>],[<background>][:"
+"<attr>[+<attr>]...]\n"
+msgstr ""
 
-#: dselect/main.cc:202
-#, c-format
-msgid "Screenparts:\n"
+#: dselect/main.cc
+#, fuzzy, c-format
+#| msgid "Screenparts:\n"
+msgid "<screen-part> is:"
 msgstr "Skärmdelar:\n"
 
-#: dselect/main.cc:207
+#: dselect/main.cc
 #, c-format
-msgid "Colours:\n"
-msgstr "Färger:\n"
+msgid "<color> is:"
+msgstr ""
 
-#: dselect/main.cc:212
+#: dselect/main.cc
 #, c-format
-msgid "Attributes:\n"
-msgstr "Attribut:\n"
+msgid "<attr> is:"
+msgstr ""
 
-#: dselect/main.cc:232
+#: dselect/main.cc
 #, c-format
 msgid "couldn't open debug file `%.255s'\n"
 msgstr "kunde inte öppna felsökningsfil \"%.255s\"\n"
 
-#: dselect/main.cc:253
+#: dselect/main.cc
 #, c-format
 msgid "invalid %s '%s'"
 msgstr "ogiltig %s \"%s\""
 
-#: dselect/main.cc:272
+#: dselect/main.cc
 msgid "screen part"
 msgstr "skärmdel"
 
-#: dselect/main.cc:278
+#: dselect/main.cc
 msgid "null colour specification"
 msgstr "tom färgangivelse"
 
-#: dselect/main.cc:286 dselect/main.cc:291
+#: dselect/main.cc
 msgid "colour"
 msgstr "färg"
 
-#: dselect/main.cc:299
+#: dselect/main.cc
 msgid "colour attribute"
 msgstr "färgattribut"
 
-#: dselect/main.cc:333
+#: dselect/main.cc
 msgid "Terminal does not appear to support cursor addressing.\n"
 msgstr "Terminalen verkar inte tillåta marköradressering.\n"
 
-#: dselect/main.cc:335
+#: dselect/main.cc
 msgid "Terminal does not appear to support highlighting.\n"
 msgstr "Terminalen verkar inte tillåta ljusmarkering.\n"
 
-#: dselect/main.cc:337
+#: dselect/main.cc
 #, c-format
 msgid ""
 "Set your TERM variable correctly, use a better terminal,\n"
@@ -940,11 +965,11 @@ msgstr ""
 "Ställ in din TERM-variabel korrekt, använd en bättre terminal\n"
 "eller lev med det per-pakethanterande verktyget %s.\n"
 
-#: dselect/main.cc:340
+#: dselect/main.cc
 msgid "terminal lacks necessary features, giving up"
 msgstr "terminalen saknar funktioner som behövs, ger upp"
 
-#: dselect/main.cc:425
+#: dselect/main.cc
 msgid ""
 "\n"
 "\n"
@@ -957,7 +982,7 @@ msgstr ""
 "Använd ^P och ^N, piltangenter, första bokstäver eller siffror.\n"
 "Tryck <Enter> för att bekräfta val. ^L ritar om skärmen.\n"
 
-#: dselect/main.cc:430
+#: dselect/main.cc
 msgid ""
 "Copyright (C) 1994-1996 Ian Jackson.\n"
 "Copyright (C) 2000,2001 Wichert Akkerman.\n"
@@ -965,7 +990,7 @@ msgstr ""
 "Copyright © 1994-1996 Ian Jackson.\n"
 "Copyright © 2000,2001 Wichert Akkerman.\n"
 
-#: dselect/main.cc:436
+#: dselect/main.cc
 msgid ""
 "\n"
 "\n"
@@ -975,57 +1000,57 @@ msgstr ""
 "\n"
 "Skrivskyddat läge: du kan bara titta på innehållet!"
 
-#: dselect/main.cc:455
+#: dselect/main.cc
 msgid "failed to getch in main menu"
 msgstr "kunde inte läsa tecken i huvudmenyn"
 
-#: dselect/main.cc:538
+#: dselect/main.cc
 #, c-format
 msgid "unknown action string `%.50s'"
 msgstr "okänd åtgärdssträng \"%.50s\""
 
-#: dselect/methlist.cc:66
+#: dselect/methlist.cc
 msgid "Abbrev."
 msgstr "Förk."
 
-#: dselect/methlist.cc:67 dselect/pkgdisplay.cc:188 dselect/pkginfo.cc:110
+#: dselect/methlist.cc dselect/pkgdisplay.cc dselect/pkginfo.cc
 msgid "Description"
 msgstr "Beskrivning"
 
-#: dselect/methlist.cc:73
+#: dselect/methlist.cc
 msgid "dselect - list of access methods"
 msgstr "dselect - lista över åtkomstmetoder"
 
-#: dselect/methlist.cc:82
+#: dselect/methlist.cc
 #, c-format
 msgid "Access method `%s'."
 msgstr "Åtkomstmetod \"%s\"."
 
-#: dselect/methlist.cc:161 dselect/pkglist.cc:587
+#: dselect/methlist.cc dselect/pkglist.cc
 msgid "doupdate failed"
 msgstr "doupdate misslyckades"
 
-#: dselect/methlist.cc:164 dselect/pkglist.cc:590
+#: dselect/methlist.cc dselect/pkglist.cc
 msgid "failed to unblock SIGWINCH"
 msgstr "kunde inte avblockera fönsteruppdatering"
 
-#: dselect/methlist.cc:169 dselect/pkglist.cc:595
+#: dselect/methlist.cc dselect/pkglist.cc
 msgid "failed to re-block SIGWINCH"
 msgstr "kunde inte åter blockera fönsteruppdatering"
 
-#: dselect/methlist.cc:170 dselect/pkglist.cc:597
+#: dselect/methlist.cc dselect/pkglist.cc
 msgid "getch failed"
 msgstr "getch misslyckades"
 
-#: dselect/methlist.cc:187
+#: dselect/methlist.cc
 msgid "Explanation"
 msgstr "Förklaring"
 
-#: dselect/methlist.cc:197
+#: dselect/methlist.cc
 msgid "No explanation available."
 msgstr "Ingen förklaring finns."
 
-#: dselect/method.cc:67
+#: dselect/method.cc
 #, c-format
 msgid ""
 "\n"
@@ -1036,7 +1061,7 @@ msgstr ""
 "\n"
 "%s: %s\n"
 
-#: dselect/method.cc:70
+#: dselect/method.cc
 msgid ""
 "\n"
 "Press <enter> to continue."
@@ -1044,185 +1069,195 @@ msgstr ""
 "\n"
 "Tryck <Enter> för att fortsätta."
 
-#: dselect/method.cc:82
+#: dselect/method.cc
 msgid "cannot unlock access method area"
 msgstr "kan inte låsa upp metodområdet"
 
-#: dselect/method.cc:96
+#: dselect/method.cc
 msgid "no access methods are available"
 msgstr "inga åtkomstmetoder är tillgängliga"
 
-#: dselect/method.cc:115
+#: dselect/method.cc
 msgid "requested operation requires superuser privilege"
 msgstr "begärd operation kräver superanvändarbehörighet"
 
-#: dselect/method.cc:118
+#: dselect/method.cc
 msgid "cannot open or create access method lockfile"
 msgstr "kan inte öppna eller skapa låsfil för åtkomstmetod"
 
-#: dselect/method.cc:125
+#: dselect/method.cc
 msgid "the access method area is already locked"
 msgstr "åtkomstmetodområdet är redan låst"
 
-#: dselect/method.cc:128
+#: dselect/method.cc
 msgid "cannot lock access method area"
 msgstr "kan inte låsa åtkomstmetodområdet"
 
-#: dselect/method.cc:161
+#: dselect/method.cc
 #, c-format
 msgid "Press <enter> to continue.\n"
 msgstr "Tryck <Enter> för att fortsätta.\n"
 
-#: dselect/method.cc:162
+#: dselect/method.cc
 msgid "<standard error>"
 msgstr "<standard fel>"
 
-#: dselect/method.cc:165
+#: dselect/method.cc
 msgid "error reading acknowledgement of program failure message"
 msgstr "kunde inte läsa bekräftelse av meddelande om programs misslyckande"
 
-#: dselect/method.cc:187
+#: dselect/method.cc
 msgid "no access method is selected or configured"
 msgstr "ingen åtkomstmetod är tillgänglig eller konfigurerad"
 
-#: dselect/method.cc:196
+#: dselect/method.cc
 msgid "update available list script"
 msgstr "skript för att uppdatera lista över tillgängliga paket"
 
-#: dselect/method.cc:200
+#: dselect/method.cc
 msgid "installation script"
 msgstr "installationsskript"
 
-#: dselect/method.cc:246
+#: dselect/method.cc
 msgid "query/setup script"
 msgstr "fråge-/inställningsskript"
 
-#: dselect/methparse.cc:53
+#: dselect/methparse.cc
 #, c-format
 msgid "syntax error in method options file `%.250s' -- %s"
 msgstr "syntaxfel i metodflaggfil \"%.250s\" -- %s"
 
-#: dselect/methparse.cc:59
+#: dselect/methparse.cc
 #, c-format
 msgid "error reading options file `%.250s'"
 msgstr "fel vid läsning av flaggfil \"%.250s\""
 
-#: dselect/methparse.cc:93
+#: dselect/methparse.cc
 #, c-format
 msgid "unable to read `%.250s' directory for reading methods"
 msgstr "kunde inte läsa katalogen \"%.250s\" för läsning av metoder"
 
-#: dselect/methparse.cc:109
+#: dselect/methparse.cc
 #, c-format
 msgid "method `%.250s' has name that is too long (%d > %d characters)"
 msgstr "metoden \"%.250s\" har ett namn som är för långt (%d > %d tecken)"
 
-#: dselect/methparse.cc:120
+#: dselect/methparse.cc
 #, c-format
 msgid "unable to access method script `%.250s'"
 msgstr "kunde inte komma åt metodskript \"%.250s\""
 
-#: dselect/methparse.cc:126
+#: dselect/methparse.cc
 #, c-format
 msgid "unable to read method options file `%.250s'"
 msgstr "kunde inte läsa metodflaggfilen \"%.250s\""
 
-#: dselect/methparse.cc:150
+#: dselect/methparse.cc
 msgid "non-digit where digit wanted"
 msgstr "icke-siffra där siffra önskades"
 
-#: dselect/methparse.cc:153
-msgid "EOF in index string"
+#: dselect/methparse.cc
+#, fuzzy
+#| msgid "EOF in index string"
+msgid "end of file in index string"
 msgstr "filslut i indexsträng"
 
-#: dselect/methparse.cc:156
+#: dselect/methparse.cc
 msgid "index string too long"
 msgstr "indexsträng för lång"
 
-#: dselect/methparse.cc:159
+#: dselect/methparse.cc
 msgid "newline before option name start"
 msgstr "nyrad före valnamns början"
 
-#: dselect/methparse.cc:161
-msgid "EOF before option name start"
-msgstr "filslut för valnamnets början"
+#: dselect/methparse.cc
+#, fuzzy
+#| msgid "newline before option name start"
+msgid "end of file before option name start"
+msgstr "nyrad före valnamns början"
 
-#: dselect/methparse.cc:165
+#: dselect/methparse.cc
 msgid "nonalpha where option name start wanted"
 msgstr "icke-bokstav där valnamnets början önskades"
 
-#: dselect/methparse.cc:167
+#: dselect/methparse.cc
 msgid "non-alphanum in option name"
 msgstr "icke-alfanumeriska tecken i valnamn"
 
-#: dselect/methparse.cc:170
-msgid "EOF in option name"
+#: dselect/methparse.cc
+#, fuzzy
+#| msgid "EOF in option name"
+msgid "end of file in option name"
 msgstr "filslut i valnamn"
 
-#: dselect/methparse.cc:175
+#: dselect/methparse.cc
 msgid "newline before summary"
 msgstr "radslut före sammanfattning"
 
-#: dselect/methparse.cc:177
-msgid "EOF before summary"
-msgstr "filslut före sammanfattning"
+#: dselect/methparse.cc
+#, fuzzy
+#| msgid "newline before summary"
+msgid "end of file before summary"
+msgstr "radslut före sammanfattning"
 
-#: dselect/methparse.cc:183
-msgid "EOF in summary - missing newline"
+#: dselect/methparse.cc
+#, fuzzy
+#| msgid "EOF in summary - missing newline"
+msgid "end of file in summary - missing newline"
 msgstr "filslut i sammanfattning - radslut saknas"
 
-#: dselect/methparse.cc:193
+#: dselect/methparse.cc
 #, c-format
 msgid "unable to open option description file `%.250s'"
 msgstr "kunde inte öppna beskrivningsfil \"%.250s\""
 
-#: dselect/methparse.cc:197
+#: dselect/methparse.cc
 #, c-format
 msgid "unable to stat option description file `%.250s'"
 msgstr "kunde inte ta status på beskrivningsfil \"%.250s\""
 
-#: dselect/methparse.cc:201
+#: dselect/methparse.cc
 #, c-format
 msgid "failed to read option description file `%.250s'"
 msgstr "kunde inte läsa beskrivningsfil \"%.250s\""
 
-#: dselect/methparse.cc:204
+#: dselect/methparse.cc
 #, c-format
 msgid "error during read of option description file `%.250s'"
 msgstr "fel vid läsning av beskrivningsfil \"%.250s\""
 
-#: dselect/methparse.cc:227
+#: dselect/methparse.cc
 #, c-format
 msgid "error during read of method options file `%.250s'"
 msgstr "fel vid läsning av metodvalfil \"%.250s\""
 
-#: dselect/methparse.cc:250
+#: dselect/methparse.cc
 #, c-format
 msgid "unable to open current option file `%.250s'"
 msgstr "kunde inte öppna aktuell valfil \"%.250s\""
 
-#: dselect/methparse.cc:286
+#: dselect/methparse.cc
 #, c-format
 msgid "unable to write new option to `%.250s'"
 msgstr "kunde inte skriva ny valfil \"%.250s\""
 
-#: dselect/pkgdisplay.cc:36
+#: dselect/pkgdisplay.cc
 msgid "new package"
 msgstr "nytt paket"
 
-#: dselect/pkgdisplay.cc:37
+#: dselect/pkgdisplay.cc
 msgid "install"
 msgstr "installera"
 
-#: dselect/pkgdisplay.cc:38
+#: dselect/pkgdisplay.cc
 msgid "hold"
 msgstr "håll"
 
-#: dselect/pkgdisplay.cc:39
+#: dselect/pkgdisplay.cc
 msgid "remove"
 msgstr "radera"
 
-#: dselect/pkgdisplay.cc:40
+#: dselect/pkgdisplay.cc
 msgid "purge"
 msgstr "radera"
 
@@ -1230,327 +1265,321 @@ msgstr "radera"
 #. * the empty string to store information about the translation. DO NOT
 #. * CHANGE THAT IN A TRANSLATION! The code really relies on that being
 #. * a single space.
-#: dselect/pkgdisplay.cc:47
+#: dselect/pkgdisplay.cc
 msgid " "
 msgstr " "
 
-#: dselect/pkgdisplay.cc:48
+#: dselect/pkgdisplay.cc
 msgid "REINSTALL"
 msgstr "OMINSTALLERA"
 
-#: dselect/pkgdisplay.cc:51
+#: dselect/pkgdisplay.cc
 msgid "not installed"
 msgstr "ej installerat"
 
-#: dselect/pkgdisplay.cc:52
+#: dselect/pkgdisplay.cc
 msgid "removed (configs remain)"
 msgstr "borttaget (konfig. kvar)"
 
-#: dselect/pkgdisplay.cc:53
+#: dselect/pkgdisplay.cc
 msgid "half installed"
 msgstr "halvinstallerat"
 
-#: dselect/pkgdisplay.cc:54
+#: dselect/pkgdisplay.cc
 msgid "unpacked (not set up)"
 msgstr "uppackat (ej konf.)"
 
-#: dselect/pkgdisplay.cc:55
+#: dselect/pkgdisplay.cc
 msgid "half configured (config failed)"
 msgstr "halvkonfigurerat (konf. misslyckad)"
 
-#: dselect/pkgdisplay.cc:56
+#: dselect/pkgdisplay.cc
 msgid "awaiting trigger processing"
 msgstr "väntar på hantering av utlösare"
 
-#: dselect/pkgdisplay.cc:57
+#: dselect/pkgdisplay.cc
 msgid "triggered"
 msgstr "utlöst"
 
-#: dselect/pkgdisplay.cc:58
+#: dselect/pkgdisplay.cc
 msgid "installed"
 msgstr "installerat"
 
-#: dselect/pkgdisplay.cc:61
+#: dselect/pkgdisplay.cc
 msgid "Required"
 msgstr "krävda"
 
-#: dselect/pkgdisplay.cc:62
+#: dselect/pkgdisplay.cc
 msgid "Important"
 msgstr "viktiga"
 
-#: dselect/pkgdisplay.cc:63
+#: dselect/pkgdisplay.cc
 msgid "Standard"
 msgstr "normala"
 
-#: dselect/pkgdisplay.cc:64
+#: dselect/pkgdisplay.cc
 msgid "Optional"
 msgstr "valbara"
 
-#: dselect/pkgdisplay.cc:65
+#: dselect/pkgdisplay.cc
 msgid "Extra"
 msgstr "extra"
 
-#: dselect/pkgdisplay.cc:66
-msgid "!Bug!"
-msgstr "!Fel!"
-
-#: dselect/pkgdisplay.cc:67
+#: dselect/pkgdisplay.cc
 msgid "Unclassified"
 msgstr "oklassificerade"
 
-#: dselect/pkgdisplay.cc:70
+#: dselect/pkgdisplay.cc
 msgid "suggests"
 msgstr "föreslår"
 
-#: dselect/pkgdisplay.cc:71
+#: dselect/pkgdisplay.cc
 msgid "recommends"
 msgstr "rekommenderar"
 
-#: dselect/pkgdisplay.cc:72
+#: dselect/pkgdisplay.cc
 msgid "depends on"
 msgstr "beror på"
 
-#: dselect/pkgdisplay.cc:73
+#: dselect/pkgdisplay.cc
 msgid "pre-depends on"
 msgstr "beror i förväg på"
 
-#: dselect/pkgdisplay.cc:74
+#: dselect/pkgdisplay.cc
 msgid "breaks"
 msgstr "förstör"
 
-#: dselect/pkgdisplay.cc:75
+#: dselect/pkgdisplay.cc
 msgid "conflicts with"
 msgstr "krockar med"
 
-#: dselect/pkgdisplay.cc:76
+#: dselect/pkgdisplay.cc
 msgid "provides"
 msgstr "tillhandahåller"
 
-#: dselect/pkgdisplay.cc:77
+#: dselect/pkgdisplay.cc
 msgid "replaces"
 msgstr "ersätter"
 
-#: dselect/pkgdisplay.cc:78
+#: dselect/pkgdisplay.cc
 msgid "enhances"
 msgstr "utökar"
 
-#: dselect/pkgdisplay.cc:81
+#: dselect/pkgdisplay.cc
 msgid "Req"
 msgstr "Krv"
 
-#: dselect/pkgdisplay.cc:82
+#: dselect/pkgdisplay.cc
 msgid "Imp"
 msgstr "Vik"
 
-#: dselect/pkgdisplay.cc:83
+#: dselect/pkgdisplay.cc
 msgid "Std"
 msgstr "Std"
 
-#: dselect/pkgdisplay.cc:84
+#: dselect/pkgdisplay.cc
 msgid "Opt"
 msgstr "Val"
 
-#: dselect/pkgdisplay.cc:85
+#: dselect/pkgdisplay.cc
 msgid "Xtr"
 msgstr "Xtr"
 
-#: dselect/pkgdisplay.cc:86
+#: dselect/pkgdisplay.cc
 msgid "bUG"
 msgstr "FEL"
 
-#: dselect/pkgdisplay.cc:87
+#: dselect/pkgdisplay.cc
 msgid "?"
 msgstr "?"
 
-#: dselect/pkgdisplay.cc:95 dselect/pkgdisplay.cc:115
+#: dselect/pkgdisplay.cc
 msgid "Broken"
 msgstr "Trasiga"
 
-#: dselect/pkgdisplay.cc:96
+#: dselect/pkgdisplay.cc
 msgid "New"
 msgstr "Nya"
 
-#: dselect/pkgdisplay.cc:97
-msgid "Updated"
-msgstr "Uppdaterade"
+#: dselect/pkgdisplay.cc
+msgid "Upgradable"
+msgstr ""
 
-#: dselect/pkgdisplay.cc:98
+#: dselect/pkgdisplay.cc
 msgid "Obsolete/local"
 msgstr "Gamla/lokala"
 
-#: dselect/pkgdisplay.cc:99
-msgid "Up-to-date"
-msgstr "Aktuella"
+#: dselect/pkgdisplay.cc
+msgid "Installed"
+msgstr "Installerade"
 
-#: dselect/pkgdisplay.cc:100
+#: dselect/pkgdisplay.cc
 msgid "Available"
 msgstr "Tillgängliga"
 
-#: dselect/pkgdisplay.cc:101 dselect/pkgdisplay.cc:117
+#: dselect/pkgdisplay.cc
 msgid "Removed"
 msgstr "Borttagna"
 
-#: dselect/pkgdisplay.cc:102 dselect/pkgdisplay.cc:111
+#: dselect/pkgdisplay.cc
 msgid "Brokenly installed packages"
 msgstr "Trasiga installerade paket"
 
-#: dselect/pkgdisplay.cc:103
+#: dselect/pkgdisplay.cc
 msgid "Newly available packages"
 msgstr "Nya tillgängliga paket"
 
-#: dselect/pkgdisplay.cc:104
-msgid "Updated packages (newer version is available)"
-msgstr "Uppdaterade paket (nyare version finns)"
+#: dselect/pkgdisplay.cc
+#, fuzzy
+#| msgid "Newly available packages"
+msgid "Upgradable packages"
+msgstr "Nya tillgängliga paket"
 
-#: dselect/pkgdisplay.cc:105
-msgid "Obsolete and local packages present on system"
+#: dselect/pkgdisplay.cc
+#, fuzzy
+#| msgid "Obsolete and local packages present on system"
+msgid "Obsolete and locally created packages"
 msgstr "Gamla och lokala paket som finns på systemet"
 
-#: dselect/pkgdisplay.cc:106
-msgid "Up to date installed packages"
-msgstr "Paket som är à jour"
+#: dselect/pkgdisplay.cc
+msgid "Installed packages"
+msgstr "Installerade paket"
 
-#: dselect/pkgdisplay.cc:107
-msgid "Available packages (not currently installed)"
-msgstr "Tillgängliga paket (ej installerade just nu)"
+#: dselect/pkgdisplay.cc
+#, fuzzy
+#| msgid "Up to date installed packages"
+msgid "Available not installed packages"
+msgstr "Paket som är à jour"
 
-#: dselect/pkgdisplay.cc:108
+#: dselect/pkgdisplay.cc
 msgid "Removed and no longer available packages"
 msgstr "Borttagna och ej längre tillgängliga paket"
 
-#: dselect/pkgdisplay.cc:112
-msgid "Installed packages"
-msgstr "Installerade paket"
-
-#: dselect/pkgdisplay.cc:113
+#: dselect/pkgdisplay.cc
 msgid "Removed packages (configuration still present)"
 msgstr "Borttagna paket (konfiguration kvar)"
 
-#: dselect/pkgdisplay.cc:114
+#: dselect/pkgdisplay.cc
 msgid "Purged packages and those never installed"
 msgstr "Raderade paket och de som aldrig installerats"
 
-#: dselect/pkgdisplay.cc:116
-msgid "Installed"
-msgstr "Installerade"
-
-#: dselect/pkgdisplay.cc:118
+#: dselect/pkgdisplay.cc
 msgid "Purged"
 msgstr "Raderade"
 
-#: dselect/pkgdisplay.cc:138
+#: dselect/pkgdisplay.cc
 msgid "Error"
 msgstr "Fel"
 
-#: dselect/pkgdisplay.cc:139
+#: dselect/pkgdisplay.cc
 msgid "Installed?"
 msgstr "Installerad?"
 
-#: dselect/pkgdisplay.cc:140
+#: dselect/pkgdisplay.cc
 msgid "Old mark"
 msgstr "Gammal markering"
 
-#: dselect/pkgdisplay.cc:141
+#: dselect/pkgdisplay.cc
 msgid "Marked for"
 msgstr "Markerad för"
 
-#: dselect/pkgdisplay.cc:143
+#: dselect/pkgdisplay.cc
 msgid "EIOM"
 msgstr "FIGM"
 
-#: dselect/pkgdisplay.cc:147 dselect/pkgdisplay.cc:150
+#: dselect/pkgdisplay.cc
 msgid "Section"
 msgstr "Avdeln."
 
-#: dselect/pkgdisplay.cc:148
+#: dselect/pkgdisplay.cc
 msgid "Priority"
 msgstr "Prioritet"
 
-#: dselect/pkgdisplay.cc:152
+#: dselect/pkgdisplay.cc
 msgid "Package"
 msgstr "Paket"
 
-#: dselect/pkgdisplay.cc:161 dselect/pkgdisplay.cc:165
+#: dselect/pkgdisplay.cc
 msgid "Avail.arch"
 msgstr "Tillg.ark"
 
-#: dselect/pkgdisplay.cc:164
+#: dselect/pkgdisplay.cc
 msgid "Inst.arch"
 msgstr "Inst.ark"
 
-#: dselect/pkgdisplay.cc:178 dselect/pkgdisplay.cc:182
+#: dselect/pkgdisplay.cc
 msgid "Avail.ver"
 msgstr "Tillg.ver"
 
-#: dselect/pkgdisplay.cc:181
+#: dselect/pkgdisplay.cc
 msgid "Inst.ver"
 msgstr "Inst.ver"
 
-#: dselect/pkgdisplay.cc:197
+#: dselect/pkgdisplay.cc
 msgid "dselect - recursive package listing"
 msgstr "dselect - rekursiv paketlistning"
 
-#: dselect/pkgdisplay.cc:199
+#: dselect/pkgdisplay.cc
 msgid "dselect - inspection of package states"
 msgstr "dselect - inspektion av paketstatus"
 
-#: dselect/pkgdisplay.cc:200
+#: dselect/pkgdisplay.cc
 msgid "dselect - main package listing"
 msgstr "dselect - huvudpaketlista"
 
-#: dselect/pkgdisplay.cc:208
+#: dselect/pkgdisplay.cc
 msgid " (by section)"
 msgstr " (per avdelning)"
 
-#: dselect/pkgdisplay.cc:211
+#: dselect/pkgdisplay.cc
 msgid " (avail., section)"
 msgstr " (tillg., avdelning)"
 
-#: dselect/pkgdisplay.cc:214
+#: dselect/pkgdisplay.cc
 msgid " (status, section)"
 msgstr " (status, avdelning)"
 
-#: dselect/pkgdisplay.cc:223
+#: dselect/pkgdisplay.cc
 msgid " (by priority)"
 msgstr " (efter prioritet)"
 
-#: dselect/pkgdisplay.cc:226
+#: dselect/pkgdisplay.cc
 msgid " (avail., priority)"
 msgstr " (tillg., prioritet)"
 
-#: dselect/pkgdisplay.cc:229
+#: dselect/pkgdisplay.cc
 msgid " (status, priority)"
 msgstr " (status, prioritet)"
 
-#: dselect/pkgdisplay.cc:238
+#: dselect/pkgdisplay.cc
 msgid " (alphabetically)"
 msgstr " (alfabetiskt)"
 
-#: dselect/pkgdisplay.cc:241
+#: dselect/pkgdisplay.cc
 msgid " (by availability)"
 msgstr " (efter tillgänglighet)"
 
-#: dselect/pkgdisplay.cc:244
+#: dselect/pkgdisplay.cc
 msgid " (by status)"
 msgstr " (efter status)"
 
-#: dselect/pkgdisplay.cc:259
+#: dselect/pkgdisplay.cc
 msgid " mark:+/=/- terse:v help:?"
 msgstr " markera:+/=/- koncis:v hjälp:?"
 
-#: dselect/pkgdisplay.cc:260
+#: dselect/pkgdisplay.cc
 msgid " mark:+/=/- verbose:v help:?"
 msgstr " markera:+/=/- pratsam:v hjälp:?"
 
-#: dselect/pkgdisplay.cc:262
+#: dselect/pkgdisplay.cc
 msgid " terse:v help:?"
 msgstr " koncis:v hjälp:?"
 
-#: dselect/pkgdisplay.cc:263
+#: dselect/pkgdisplay.cc
 msgid " verbose:v help:?"
 msgstr " pratsam:v hjälp:?"
 
-#: dselect/pkginfo.cc:85
+#: dselect/pkginfo.cc
 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 "
@@ -1570,80 +1599,110 @@ msgstr ""
 "Du kan använda \"o\" och \"O\" för att välja sorteringsordningen och ge dig "
 "själv möjligheten att markera paket i olika sorters grupper."
 
-#: dselect/pkginfo.cc:98
+#: dselect/pkginfo.cc
 msgid "Interrelationships"
 msgstr "Inbördes beroenden"
 
-#: dselect/pkginfo.cc:117
+#: dselect/pkginfo.cc
 msgid "No description available."
 msgstr "Ingen beskrivning finns."
 
-#: dselect/pkginfo.cc:135
+#: dselect/pkginfo.cc
 msgid "Installed control file information"
 msgstr "Installerad kontrollfilsinformation för "
 
-#: dselect/pkginfo.cc:151
+#: dselect/pkginfo.cc
 msgid "Available control file information"
 msgstr "Tillgänglig kontrollfilsinformation för"
 
-#: dselect/pkglist.cc:425
+#: dselect/pkglist.cc
 msgid "there are no packages"
 msgstr "det finns inte några paket"
 
-#: dselect/pkglist.cc:521
+#: dselect/pkglist.cc
 msgid "invalid search option given"
 msgstr "ogiltigt sökflagga given"
 
-#: dselect/pkglist.cc:536
+#: dselect/pkglist.cc
 msgid "error in regular expression"
 msgstr "fel i reguljärt uttryck"
 
-#: dselect/pkgsublist.cc:111
+#: dselect/pkgsublist.cc
 msgid " does not appear to be available\n"
 msgstr " verkar inte vara tillgänglig\n"
 
-#: dselect/pkgsublist.cc:131
+#: dselect/pkgsublist.cc
 msgid " or "
 msgstr " eller "
 
-#: dselect/pkgtop.cc:58
+#: dselect/pkgtop.cc
 msgid "All"
 msgstr "Alla"
 
-#: dselect/pkgtop.cc:80
+#: dselect/pkgtop.cc
 msgid "All packages"
 msgstr "Alla paket"
 
-#: dselect/pkgtop.cc:84
+#: dselect/pkgtop.cc
 #, c-format
 msgid "%s packages without a section"
 msgstr "%s paket utan avdelning"
 
-#: dselect/pkgtop.cc:86
+#: dselect/pkgtop.cc
 #, c-format
 msgid "%s packages in section %s"
 msgstr "%s i avdelning %s"
 
-#: dselect/pkgtop.cc:92
+#: dselect/pkgtop.cc
 #, c-format
 msgid "%s %s packages"
 msgstr "%s %s paket"
 
-#: dselect/pkgtop.cc:96
+#: dselect/pkgtop.cc
 #, c-format
 msgid "%s %s packages without a section"
 msgstr "%s %s paket utan avdelning"
 
-#: dselect/pkgtop.cc:98
+#: dselect/pkgtop.cc
 #, c-format
 msgid "%s %s packages in section %s"
 msgstr "%s %s paket i avdelning %s"
 
-#: dselect/pkgtop.cc:119
+#: dselect/pkgtop.cc
 #, c-format
 msgid "%-*s %s%s%s;  %s (was: %s).  %s"
 msgstr "%-*s %s%s%s;  %s (var: %s).  %s"
 
+#~ msgid "Actions:\n"
+#~ msgstr "Åtgärder:\n"
+
+#~ msgid "Colours:\n"
+#~ msgstr "Färger:\n"
+
+#~ msgid "Attributes:\n"
+#~ msgstr "Attribut:\n"
+
+#~ msgid "EOF before option name start"
+#~ msgstr "filslut för valnamnets början"
+
+#~ msgid "EOF before summary"
+#~ msgstr "filslut före sammanfattning"
+
+#~ msgid "!Bug!"
+#~ msgstr "!Fel!"
+
+#~ msgid "Updated"
+#~ msgstr "Uppdaterade"
+
+#~ msgid "Up-to-date"
+#~ msgstr "Aktuella"
+
+#~ msgid "Updated packages (newer version is available)"
+#~ msgstr "Uppdaterade paket (nyare version finns)"
+
+#~ msgid "Available packages (not currently installed)"
+#~ msgstr "Tillgängliga paket (ej installerade just nu)"
+
 #~ msgid "foreign architectures enabled but multi-arch is not supported"
 #~ msgstr "oegna arkitekturer aktiverade men flerarkitektursstöd saknas"
 
diff --git a/dselect/po/tl.po b/dselect/po/tl.po
index a669c1c33..a85f6556f 100644
--- a/dselect/po/tl.po
+++ b/dselect/po/tl.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dselect 1.13\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2014-12-23 18:12+0100\n"
+"POT-Creation-Date: 2015-04-06 09:37+0200\n"
 "PO-Revision-Date: 2006-02-17 08:58+0200\n"
 "Last-Translator: Eric Pareja <xenos@upm.edu.ph>\n"
 "Language-Team: Tagalog <debian-tl@banwa.upm.edu.ph>\n"
@@ -17,30 +17,30 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: dselect/basecmds.cc:125
+#: dselect/basecmds.cc
 msgid "Search for ? "
 msgstr "Maghanap ng ? "
 
-#: dselect/basecmds.cc:149
+#: dselect/basecmds.cc
 msgid "Error: "
 msgstr "Error: "
 
-#: dselect/basecmds.cc:180
+#: dselect/basecmds.cc
 msgid "Help: "
 msgstr "Tulong: "
 
-#: dselect/basecmds.cc:186
+#: dselect/basecmds.cc
 msgid "Press ? for help menu, . for next topic, <space> to exit help."
 msgstr ""
 "Pindutin ang ? para sa menu ng tulong, . para sa susunod na paksa,\n"
 "<puwang> upang lumabas sa tulong."
 
-#: dselect/basecmds.cc:193
+#: dselect/basecmds.cc
 msgid "Help information is available under the following topics:"
 msgstr ""
 "Ang magagamit niyong impormasyong makakatulong ay sa mga sumusunod na paksa:"
 
-#: dselect/basecmds.cc:201
+#: dselect/basecmds.cc
 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. "
@@ -49,244 +49,244 @@ msgstr ""
 "lumabas\n"
 "sa tulong o `.' (tuldok) upang basahin ang bawat pahina ng tulong. "
 
-#: dselect/basecmds.cc:207
+#: dselect/basecmds.cc
 msgid "error reading keyboard in help"
 msgstr "error sa pagbasa ng tiklado habang nasa modong pagtulong"
 
-#: dselect/baselist.cc:60
+#: dselect/baselist.cc
 msgid "ioctl(TIOCGWINSZ) failed"
 msgstr "bigo ang ioctl(TIOCGWINSZ)"
 
-#: dselect/baselist.cc:63
+#: dselect/baselist.cc
 msgid "doupdate in SIGWINCH handler failed"
 msgstr "bigo ang doupdate sa handler ng SIGWINCH"
 
-#: dselect/baselist.cc:72
+#: dselect/baselist.cc
 msgid "failed to restore old SIGWINCH sigact"
 msgstr "bigong ibalik ang lumang SIGWINCH sigact"
 
-#: dselect/baselist.cc:75
+#: dselect/baselist.cc
 msgid "failed to restore old signal mask"
 msgstr "bigong ibalik ang lumang maskarang hudyat"
 
-#: dselect/baselist.cc:86
+#: dselect/baselist.cc
 msgid "failed to get old signal mask"
 msgstr "bigong makuha ang lumang maskarang hudyat"
 
-#: dselect/baselist.cc:88
+#: dselect/baselist.cc
 msgid "failed to get old SIGWINCH sigact"
 msgstr "bigong makuha ang lumang SIGWINCH sigact"
 
-#: dselect/baselist.cc:93
+#: dselect/baselist.cc
 msgid "failed to block SIGWINCH"
 msgstr "bigong iharang ang SIGWINCH"
 
-#: dselect/baselist.cc:99
+#: dselect/baselist.cc
 msgid "failed to set new SIGWINCH sigact"
 msgstr "bigong itakda ang bagong SIGWINCH sigact"
 
-#: dselect/baselist.cc:174
+#: dselect/baselist.cc
 msgid "failed to allocate colour pair"
 msgstr "bigo ang paglaan ng pares ng kulay"
 
-#: dselect/baselist.cc:203
+#: dselect/baselist.cc
 msgid "failed to create title window"
 msgstr "bigo ang paglikha ng bintana ng pamagat"
 
-#: dselect/baselist.cc:207
+#: dselect/baselist.cc
 msgid "failed to create whatinfo window"
 msgstr "bigo ang paglikha ng bintana ng whatinfo"
 
-#: dselect/baselist.cc:211
+#: dselect/baselist.cc
 msgid "failed to create baselist pad"
 msgstr "bigo ang paglikha ng baselist pad"
 
-#: dselect/baselist.cc:214
+#: dselect/baselist.cc
 msgid "failed to create heading pad"
 msgstr "bigo ang paglikha ng heading pad"
 
-#: dselect/baselist.cc:218
+#: dselect/baselist.cc
 msgid "failed to create thisstate pad"
 msgstr "bigo ang paglikha ng thisstate pad"
 
-#: dselect/baselist.cc:222
+#: dselect/baselist.cc
 msgid "failed to create info pad"
 msgstr "bigo ang paglikha ng info pad"
 
-#: dselect/baselist.cc:227
+#: dselect/baselist.cc
 msgid "failed to create query window"
 msgstr "bigo ang paglikha ng bintana ng tanong"
 
-#: dselect/baselist.cc:298
+#: dselect/baselist.cc
 #, fuzzy
 msgid "Keybindings"
 msgstr "mga keybinding"
 
-#: dselect/baselist.cc:347
+#: dselect/baselist.cc
 #, c-format
 msgid "  -- %d%%, press "
 msgstr "  -- %d%%, pindutin "
 
-#: dselect/baselist.cc:350
+#: dselect/baselist.cc
 #, c-format
 msgid "%s for more"
 msgstr "%s upang sumulong"
 
-#: dselect/baselist.cc:354
+#: dselect/baselist.cc
 #, c-format
 msgid "%s to go back"
 msgstr "%s upang bumalik"
 
-#: dselect/bindings.cc:78
+#: dselect/bindings.cc
 msgid "[not bound]"
 msgstr "[hindi nakatakda]"
 
-#: dselect/bindings.cc:82
+#: dselect/bindings.cc
 #, c-format
 msgid "[unk: %d]"
 msgstr "[di kilala: %d]"
 
-#: dselect/bindings.cc:141
+#: dselect/bindings.cc
 msgid "Scroll onwards through help/information"
 msgstr "Umabante sa tulong/impormasyon"
 
-#: dselect/bindings.cc:142
+#: dselect/bindings.cc
 msgid "Scroll backwards through help/information"
 msgstr "Umatras sa tulong/impormasyon"
 
-#: dselect/bindings.cc:143
+#: dselect/bindings.cc
 msgid "Move up"
 msgstr "Umakyat"
 
-#: dselect/bindings.cc:144
+#: dselect/bindings.cc
 msgid "Move down"
 msgstr "Bumaba"
 
-#: dselect/bindings.cc:145
+#: dselect/bindings.cc
 msgid "Go to top of list"
 msgstr "Pumunta sa puno ng listahan"
 
-#: dselect/bindings.cc:146
+#: dselect/bindings.cc
 msgid "Go to end of list"
 msgstr "Pumunta sa dulo ng listahan"
 
-#: dselect/bindings.cc:147
+#: dselect/bindings.cc
 msgid "Request help (cycle through help screens)"
 msgstr "Humingi ng tulong (iikot sa mga tabing ng payo)"
 
-#: dselect/bindings.cc:148
+#: dselect/bindings.cc
 msgid "Cycle through information displays"
 msgstr "Umikot sa mga tabing ng impormasyon"
 
-#: dselect/bindings.cc:149
+#: dselect/bindings.cc
 msgid "Redraw display"
 msgstr "Iguhit muli ang tabing"
 
-#: dselect/bindings.cc:150
+#: dselect/bindings.cc
 msgid "Scroll onwards through list by 1 line"
 msgstr "Umabante sa listahan ng isang linya"
 
-#: dselect/bindings.cc:151
+#: dselect/bindings.cc
 msgid "Scroll backwards through list by 1 line"
 msgstr "Umatras sa listahan ng isang linya"
 
-#: dselect/bindings.cc:152
+#: dselect/bindings.cc
 msgid "Scroll onwards through help/information by 1 line"
 msgstr "Umabante sa tulong/impormasyon ng isang linya"
 
-#: dselect/bindings.cc:153
+#: dselect/bindings.cc
 msgid "Scroll backwards through help/information by 1 line"
 msgstr "Umatras sa tulong/impormasyon ng isang linya"
 
-#: dselect/bindings.cc:154
+#: dselect/bindings.cc
 msgid "Scroll onwards through list"
 msgstr "Umabante sa listahan"
 
-#: dselect/bindings.cc:155
+#: dselect/bindings.cc
 msgid "Scroll backwards through list"
 msgstr "Umatras sa listahan"
 
-#: dselect/bindings.cc:158
+#: dselect/bindings.cc
 msgid "Mark package(s) for installation"
 msgstr "Markahan ang (mga) pakete na iluluklok"
 
-#: dselect/bindings.cc:159
+#: dselect/bindings.cc
 msgid "Mark package(s) for deinstallation"
 msgstr "Markahan ang (mga) pakete na tatanggalin"
 
-#: dselect/bindings.cc:160
+#: dselect/bindings.cc
 msgid "Mark package(s) for deinstall and purge"
 msgstr "Markahan ang (mga) pakete na tatanggalin at pupurgahin"
 
-#: dselect/bindings.cc:161
+#: dselect/bindings.cc
 msgid "Make highlight more specific"
 msgstr "Gawing mas-tiyak ang highlight"
 
-#: dselect/bindings.cc:162
+#: dselect/bindings.cc
 msgid "Make highlight less specific"
 msgstr "Gawing mas-malawak ang highlight"
 
-#: dselect/bindings.cc:163
+#: dselect/bindings.cc
 msgid "Search for a package whose name contains a string"
 msgstr "Hanapin ang paketeng may pangalang naglalaman ng isang string"
 
-#: dselect/bindings.cc:164
+#: dselect/bindings.cc
 #, fuzzy
 #| msgid "Repeat last search."
 msgid "Repeat last search"
 msgstr "Ulitin ang huling paghahanap."
 
-#: dselect/bindings.cc:165
+#: dselect/bindings.cc
 msgid "Swap sort order priority/section"
 msgstr "Ipagpalit ang pagkasunod-sunod antas/seksyon"
 
-#: dselect/bindings.cc:166
+#: dselect/bindings.cc
 msgid "Quit, confirming, and checking dependencies"
 msgstr "Lumabas, tiyakin at suriin ang mga dependensiya"
 
-#: dselect/bindings.cc:167
+#: dselect/bindings.cc
 msgid "Quit, confirming without check"
 msgstr "Lumabas, tiyakin ngunit walang pagsusuri"
 
-#: dselect/bindings.cc:168
+#: dselect/bindings.cc
 msgid "Quit, rejecting conflict/dependency suggestions"
 msgstr ""
 "Lumabas, huwag tanggapin ang mga mungkahi tungkol sa tunggalian/dependensiya"
 
-#: dselect/bindings.cc:169
+#: dselect/bindings.cc
 msgid "Abort - quit without making changes"
 msgstr "Huminto - lumabas na walang binabago"
 
-#: dselect/bindings.cc:170
+#: dselect/bindings.cc
 msgid "Revert to old state for all packages"
 msgstr "Bumalik sa nakaraang kalagayan para sa lahat ng mga pakete"
 
-#: dselect/bindings.cc:171
+#: dselect/bindings.cc
 msgid "Revert to suggested state for all packages"
 msgstr "Bumalik sa mungkahing kalagayan para sa lahat ng mga pakete"
 
-#: dselect/bindings.cc:172
+#: dselect/bindings.cc
 msgid "Revert to directly requested state for all packages"
 msgstr "Bumalik sa hiniling na kalagayan para sa lahat ng mga pakete"
 
-#: dselect/bindings.cc:173
+#: dselect/bindings.cc
 #, fuzzy
 msgid "Revert to currently installed state for all packages"
 msgstr "Bumalik sa hiniling na kalagayan para sa lahat ng mga pakete"
 
-#: dselect/bindings.cc:176
+#: dselect/bindings.cc
 msgid "Select currently-highlighted access method"
 msgstr "Piliin ang naka-highlight na paraan ng pag-akses"
 
-#: dselect/bindings.cc:177
+#: dselect/bindings.cc
 msgid "Quit without changing selected access method"
 msgstr "Lumabas na hindi binabago ang piniling paraan ng pag-akses"
 
-#: dselect/helpmsgs.cc:29
+#: dselect/helpmsgs.cc
 msgid "Keystrokes"
 msgstr "Tiklado"
 
-#: dselect/helpmsgs.cc:29
+#: dselect/helpmsgs.cc
 #, fuzzy
 msgid ""
 "Motion keys: Next/Previous, Top/End, Up/Down, Backwards/Forwards:\n"
@@ -348,11 +348,11 @@ msgstr ""
 "   D     set all to Directly requested state  n, \\  ulitin ang huling "
 "paghanap\n"
 
-#: dselect/helpmsgs.cc:55
+#: dselect/helpmsgs.cc
 msgid "Introduction to package selections"
 msgstr "Pagpapakilala sa pagpili ng mga pakete"
 
-#: dselect/helpmsgs.cc:55
+#: dselect/helpmsgs.cc
 msgid ""
 "Welcome to dselect's main package listing.\n"
 "\n"
@@ -418,11 +418,11 @@ msgstr ""
 "Pindutin ang <puwang> upang lumabas sa tulong at bumalik sa listahan "
 "ngayon.\n"
 
-#: dselect/helpmsgs.cc:80
+#: dselect/helpmsgs.cc
 msgid "Introduction to read-only package list browser"
 msgstr "Pagpapakilala sa browser ng listahan ng mga pakete na pagbasa-lamang"
 
-#: dselect/helpmsgs.cc:80
+#: dselect/helpmsgs.cc
 msgid ""
 "Welcome to dselect's main package listing.\n"
 "\n"
@@ -465,11 +465,11 @@ msgstr ""
 "Pindutin ang <puwang> upang lumabas sa tulong at bumalik sa listahan "
 "ngayon.\n"
 
-#: dselect/helpmsgs.cc:99
+#: dselect/helpmsgs.cc
 msgid "Introduction to conflict/dependency resolution sub-list"
 msgstr "Pagpapakilala sa sub-list ng pag-ayos ng conflict/dependensiya"
 
-#: dselect/helpmsgs.cc:99
+#: dselect/helpmsgs.cc
 msgid ""
 "Dependency/conflict resolution - introduction.\n"
 "\n"
@@ -539,11 +539,11 @@ msgstr ""
 "Pindutin ang <puwang> upang lumabas sa tulong at pumasok sa sub-list;\n"
 "alalahanin: pindutin ang `?' para sa tulong.\n"
 
-#: dselect/helpmsgs.cc:125
+#: dselect/helpmsgs.cc
 msgid "Display, part 1: package listing and status chars"
 msgstr "Display, ika-1 bahagi: listahan ng mga pakete at kalagayang titik"
 
-#: dselect/helpmsgs.cc:125
+#: dselect/helpmsgs.cc
 #, fuzzy
 msgid ""
 "The top half of the screen shows a list of packages.  For each package you "
@@ -616,11 +616,11 @@ msgstr ""
 "paglalarawang\n"
 "maikli ng bawat pakete.\n"
 
-#: dselect/helpmsgs.cc:152
+#: dselect/helpmsgs.cc
 msgid "Display, part 2: list highlight; information display"
 msgstr "Display, ika-2 bahagi: listahang highlight; pagpakita ng impormasyon"
 
-#: dselect/helpmsgs.cc:152
+#: dselect/helpmsgs.cc
 msgid ""
 "* Highlight: One line in the package list will be highlighted.  It "
 "indicates\n"
@@ -677,11 +677,11 @@ msgstr ""
 "  ang display ng impormasyon o lakihan ito na gamitin ang halos buong "
 "tabing.\n"
 
-#: dselect/helpmsgs.cc:176
+#: dselect/helpmsgs.cc
 msgid "Introduction to method selection display"
 msgstr "Pagpapakilala sa pagpili ng paraan"
 
-#: dselect/helpmsgs.cc:176
+#: dselect/helpmsgs.cc
 msgid ""
 "dselect and dpkg can do automatic installation, loading the package files to "
 "be\n"
@@ -719,11 +719,11 @@ msgstr ""
 "Maaaring makita ang buong listahan ng magagamit na tiklado sa pagpindot ng\n"
 "`k'ilalanin, o mula sa menu ng tulong na makikita sa pagpindot ng `?'.\n"
 
-#: dselect/helpmsgs.cc:196
+#: dselect/helpmsgs.cc
 msgid "Keystrokes for method selection"
 msgstr "Tikladong gamit sa pagpili ng paraan"
 
-#: dselect/helpmsgs.cc:196
+#: dselect/helpmsgs.cc
 #, fuzzy
 msgid ""
 "Motion keys: Next/Previous, Top/End, Up/Down, Backwards/Forwards:\n"
@@ -774,104 +774,104 @@ msgstr ""
 "  /                  paghanap (pindutin ang return para ihinto)\n"
 "  \\                  ulitin ang huling paghanap\n"
 
-#: dselect/main.cc:63
+#: dselect/main.cc
 msgid "Type dselect --help for help."
 msgstr "dselect --help para sa tulong."
 
-#: dselect/main.cc:145
+#: dselect/main.cc
 msgid "a"
 msgstr "a"
 
-#: dselect/main.cc:145
+#: dselect/main.cc
 msgid "[A]ccess"
 msgstr "[A]kses"
 
-#: dselect/main.cc:145
+#: dselect/main.cc
 msgid "Choose the access method to use."
 msgstr "Piliin ang paraan ng pag-akses na gagamitin."
 
-#: dselect/main.cc:146
+#: dselect/main.cc
 msgid "u"
 msgstr "u"
 
-#: dselect/main.cc:146
+#: dselect/main.cc
 msgid "[U]pdate"
 msgstr "[U]pdate/Isariwa"
 
-#: dselect/main.cc:146
+#: dselect/main.cc
 msgid "Update list of available packages, if possible."
 msgstr "Isariwa ang listahan ng magagamit na mga pakete, kung kaya."
 
-#: dselect/main.cc:147
+#: dselect/main.cc
 msgid "s"
 msgstr "p"
 
-#: dselect/main.cc:147
+#: dselect/main.cc
 msgid "[S]elect"
 msgstr "[P]umili"
 
-#: dselect/main.cc:147
+#: dselect/main.cc
 msgid "Request which packages you want on your system."
 msgstr "Hilingin ang mga paketeng nais niyo sa inyong sistema."
 
-#: dselect/main.cc:148
+#: dselect/main.cc
 msgid "i"
 msgstr "i"
 
-#: dselect/main.cc:148
+#: dselect/main.cc
 msgid "[I]nstall"
 msgstr "[I]luklok"
 
-#: dselect/main.cc:148
+#: dselect/main.cc
 msgid "Install and upgrade wanted packages."
 msgstr "Iluklok at i-apgreyd ang mga paketeng ninanais."
 
-#: dselect/main.cc:149
+#: dselect/main.cc
 msgid "c"
 msgstr "c"
 
-#: dselect/main.cc:149
+#: dselect/main.cc
 msgid "[C]onfig"
 msgstr "[C]onfig/Isaayos"
 
-#: dselect/main.cc:149
+#: dselect/main.cc
 msgid "Configure any packages that are unconfigured."
 msgstr "Isaayos ang mga paketeng hindi pa nakaayos."
 
-#: dselect/main.cc:150
+#: dselect/main.cc
 msgid "r"
 msgstr "t"
 
-#: dselect/main.cc:150
+#: dselect/main.cc
 msgid "[R]emove"
 msgstr "[T]anggalin"
 
-#: dselect/main.cc:150
+#: dselect/main.cc
 msgid "Remove unwanted software."
 msgstr "Tanggalin ang hindi gustong mga software."
 
-#: dselect/main.cc:151
+#: dselect/main.cc
 msgid "q"
 msgstr "q"
 
-#: dselect/main.cc:151
+#: dselect/main.cc
 msgid "[Q]uit"
 msgstr "[Q]uit/Lumabas"
 
-#: dselect/main.cc:151
+#: dselect/main.cc
 msgid "Quit dselect."
 msgstr "Lumabas sa dselect."
 
-#: dselect/main.cc:152
+#: dselect/main.cc
 msgid "menu"
 msgstr "menu"
 
-#: dselect/main.cc:157
+#: dselect/main.cc
 #, fuzzy, c-format
 msgid "Debian `%s' package handling frontend version %s.\n"
 msgstr "Debian `%s' mukha ng tagapangasiwa ng mga pakete."
 
-#: dselect/main.cc:160
+#: dselect/main.cc
 #, fuzzy
 msgid ""
 "This is free software; see the GNU General Public License version 2 or\n"
@@ -882,96 +882,103 @@ msgstr ""
 "mas-bago para sa kundisyon ng pangongopya. Walang waranti.\n"
 "Basahin ang dpkg-deb --licence para sa detalye.\n"
 
-#: dselect/main.cc:169 dselect/main.cc:217
+#: dselect/main.cc
 msgid "<standard output>"
 msgstr ""
 
-#: dselect/main.cc:180
+#: dselect/main.cc
 #, c-format
 msgid ""
-"Usage: %s [<option> ...] [<action> ...]\n"
+"Usage: %s [<option>...] [<command>...]\n"
 "\n"
 msgstr ""
 
-#: dselect/main.cc:184
+#: dselect/main.cc
+#, c-format
+msgid "Commands:\n"
+msgstr ""
+
+#: dselect/main.cc
 #, c-format
 msgid ""
 "Options:\n"
-"  --admindir <directory>     Use <directory> instead of %s.\n"
-"  --expert                   Turn on expert mode.\n"
-"  --debug <file> | -D<file>  Turn on debugging, sending output to <file>.\n"
-"  --colour | --color screenpart:[foreground],[background][:attr[+attr+...]]\n"
-"                             Configure screen colours.\n"
-"\n"
+"      --admindir <directory>       Use <directory> instead of %s.\n"
+"      --expert                     Turn on expert mode.\n"
+"  -D, --debug <file>               Turn on debugging, send output to "
+"<file>.\n"
+"      --color <color-spec>         Configure screen colors.\n"
+"      --colour <color-spec>        Ditto.\n"
 msgstr ""
 
-#: dselect/main.cc:193
+#: dselect/main.cc
 #, c-format
 msgid ""
-"  --help                     Show this help message.\n"
-"  --version                  Show the version.\n"
+"  -?, --help                       Show this help message.\n"
+"      --version                    Show the version.\n"
 "\n"
 msgstr ""
 
-#: dselect/main.cc:197
-#, fuzzy, c-format
-#| msgid "Section"
-msgid "Actions:\n"
-msgstr "Section"
-
-#: dselect/main.cc:202
+#: dselect/main.cc
 #, c-format
-msgid "Screenparts:\n"
+msgid ""
+"<color-spec> is <screen-part>:[<foreground>],[<background>][:"
+"<attr>[+<attr>]...]\n"
+msgstr ""
+
+#: dselect/main.cc
+#, fuzzy, c-format
+#| msgid "Screenparts:\n"
+msgid "<screen-part> is:"
 msgstr "Bahagingtabing:\n"
 
-#: dselect/main.cc:207
+#: dselect/main.cc
 #, c-format
-msgid "Colours:\n"
-msgstr "Colours/Mga kulay:\n"
+msgid "<color> is:"
+msgstr ""
 
-#: dselect/main.cc:212
+#: dselect/main.cc
 #, c-format
-msgid "Attributes:\n"
-msgstr "Mga attribute:\n"
+msgid "<attr> is:"
+msgstr ""
 
-#: dselect/main.cc:232
+#: dselect/main.cc
 #, c-format
 msgid "couldn't open debug file `%.255s'\n"
 msgstr "hindi mabuksan ang talaksang pan-debug `%.255s'\n"
 
-#: dselect/main.cc:253
+#: dselect/main.cc
 #, fuzzy, c-format
 #| msgid "Invalid %s `%s'\n"
 msgid "invalid %s '%s'"
 msgstr "Di tanggap na %s `%s'\n"
 
-#: dselect/main.cc:272
+#: dselect/main.cc
 msgid "screen part"
 msgstr "bahagi ng tabing"
 
-#: dselect/main.cc:278
+#: dselect/main.cc
 #, fuzzy
 #| msgid "Null colour specification\n"
 msgid "null colour specification"
 msgstr "Null na spesipikasyong pangkulay\n"
 
-#: dselect/main.cc:286 dselect/main.cc:291
+#: dselect/main.cc
 msgid "colour"
 msgstr "kulay"
 
-#: dselect/main.cc:299
+#: dselect/main.cc
 msgid "colour attribute"
 msgstr "attribute ng kulay"
 
-#: dselect/main.cc:333
+#: dselect/main.cc
 msgid "Terminal does not appear to support cursor addressing.\n"
 msgstr "Mukhang ang himpilan ay hindi sumusuporta ng cursor addressing.\n"
 
-#: dselect/main.cc:335
+#: dselect/main.cc
 msgid "Terminal does not appear to support highlighting.\n"
 msgstr "Mukhang ang himpilan ay hindi sumusuporta ng highlighting.\n"
 
-#: dselect/main.cc:337
+#: dselect/main.cc
 #, fuzzy, c-format
 msgid ""
 "Set your TERM variable correctly, use a better terminal,\n"
@@ -981,11 +988,11 @@ msgstr ""
 "himpilan,\n"
 "o kayanin na lamang na gamit ang kasangkapang tagapangasiwa ng bawat pakete "
 
-#: dselect/main.cc:340
+#: dselect/main.cc
 msgid "terminal lacks necessary features, giving up"
 msgstr "kulang ng kailangan na mga feature ang terminal, sumusuko na"
 
-#: dselect/main.cc:425
+#: dselect/main.cc
 msgid ""
 "\n"
 "\n"
@@ -1001,13 +1008,13 @@ msgstr ""
 "tabing.\n"
 "\n"
 
-#: dselect/main.cc:430
+#: dselect/main.cc
 msgid ""
 "Copyright (C) 1994-1996 Ian Jackson.\n"
 "Copyright (C) 2000,2001 Wichert Akkerman.\n"
 msgstr ""
 
-#: dselect/main.cc:436
+#: dselect/main.cc
 msgid ""
 "\n"
 "\n"
@@ -1017,58 +1024,58 @@ msgstr ""
 "\n"
 "Pagbasa-lamang na akses: matitignan lamang ang magagamit na mga pagpipilian!"
 
-#: dselect/main.cc:455
+#: dselect/main.cc
 msgid "failed to getch in main menu"
 msgstr "bigo ang getch sa pangunahing menu"
 
-#: dselect/main.cc:538
+#: dselect/main.cc
 #, c-format
 msgid "unknown action string `%.50s'"
 msgstr "di kilalang action string `%.50s'"
 
-#: dselect/methlist.cc:66
+#: dselect/methlist.cc
 msgid "Abbrev."
 msgstr "Daglat"
 
-#: dselect/methlist.cc:67 dselect/pkgdisplay.cc:188 dselect/pkginfo.cc:110
+#: dselect/methlist.cc dselect/pkgdisplay.cc dselect/pkginfo.cc
 msgid "Description"
 msgstr "Paglalarawan"
 
-#: dselect/methlist.cc:73
+#: dselect/methlist.cc
 msgid "dselect - list of access methods"
 msgstr "dselect - listahan ng paraan ng akses"
 
-#: dselect/methlist.cc:82
+#: dselect/methlist.cc
 #, c-format
 msgid "Access method `%s'."
 msgstr "Paraan ng akses `%s'."
 
-#: dselect/methlist.cc:161 dselect/pkglist.cc:587
+#: dselect/methlist.cc dselect/pkglist.cc
 msgid "doupdate failed"
 msgstr "bigo ang doupdate"
 
-#: dselect/methlist.cc:164 dselect/pkglist.cc:590
+#: dselect/methlist.cc dselect/pkglist.cc
 msgid "failed to unblock SIGWINCH"
 msgstr "bigo sa pag-unblock ng SIGWINCH"
 
-#: dselect/methlist.cc:169 dselect/pkglist.cc:595
+#: dselect/methlist.cc dselect/pkglist.cc
 msgid "failed to re-block SIGWINCH"
 msgstr "bigo sa pag-re-block ng SIGWINCH"
 
-#: dselect/methlist.cc:170 dselect/pkglist.cc:597
+#: dselect/methlist.cc dselect/pkglist.cc
 msgid "getch failed"
 msgstr "bigo ang getch"
 
-#: dselect/methlist.cc:187
+#: dselect/methlist.cc
 #, fuzzy
 msgid "Explanation"
 msgstr "paliwanag ng "
 
-#: dselect/methlist.cc:197
+#: dselect/methlist.cc
 msgid "No explanation available."
 msgstr "Walang paliwanag na maibigay."
 
-#: dselect/method.cc:67
+#: dselect/method.cc
 #, c-format
 msgid ""
 "\n"
@@ -1079,7 +1086,7 @@ msgstr ""
 "\n"
 "%s: %s\n"
 
-#: dselect/method.cc:70
+#: dselect/method.cc
 msgid ""
 "\n"
 "Press <enter> to continue."
@@ -1087,194 +1094,204 @@ msgstr ""
 "\n"
 "Pindutin ang <enter> upang magpatuloy."
 
-#: dselect/method.cc:82
+#: dselect/method.cc
 msgid "cannot unlock access method area"
 msgstr ""
 
-#: dselect/method.cc:96
+#: dselect/method.cc
 #, fuzzy
 #| msgid " does not appear to be available\n"
 msgid "no access methods are available"
 msgstr " ay mukhang hindi magagamit\n"
 
-#: dselect/method.cc:115
+#: dselect/method.cc
 msgid "requested operation requires superuser privilege"
 msgstr ""
 
-#: dselect/method.cc:118
+#: dselect/method.cc
 #, fuzzy
 #| msgid "Choose the access method to use."
 msgid "cannot open or create access method lockfile"
 msgstr "Piliin ang paraan ng pag-akses na gagamitin."
 
-#: dselect/method.cc:125
+#: dselect/method.cc
 msgid "the access method area is already locked"
 msgstr ""
 
-#: dselect/method.cc:128
+#: dselect/method.cc
 #, fuzzy
 #| msgid "dselect - list of access methods"
 msgid "cannot lock access method area"
 msgstr "dselect - listahan ng paraan ng akses"
 
-#: dselect/method.cc:161
+#: dselect/method.cc
 #, c-format
 msgid "Press <enter> to continue.\n"
 msgstr "Pindutin ang <enter> upang magpatuloy.\n"
 
-#: dselect/method.cc:162
+#: dselect/method.cc
 #, fuzzy
 msgid "<standard error>"
 msgstr "error sa pagsulat sa standard error"
 
-#: dselect/method.cc:165
+#: dselect/method.cc
 msgid "error reading acknowledgement of program failure message"
 msgstr ""
 "error sa pagbasa ng pagkilala ng mensahe tungkol sa pagkabigo ng programa"
 
-#: dselect/method.cc:187
+#: dselect/method.cc
 msgid "no access method is selected or configured"
 msgstr ""
 
-#: dselect/method.cc:196
+#: dselect/method.cc
 msgid "update available list script"
 msgstr "scriptong pang-apdeyt ang magagamit na listahan"
 
-#: dselect/method.cc:200
+#: dselect/method.cc
 msgid "installation script"
 msgstr "scriptong tagaluklok"
 
-#: dselect/method.cc:246
+#: dselect/method.cc
 msgid "query/setup script"
 msgstr "scriptong pagtanong/paghanda"
 
-#: dselect/methparse.cc:53
+#: dselect/methparse.cc
 #, c-format
 msgid "syntax error in method options file `%.250s' -- %s"
 msgstr "syntax error sa talaksang opsyon ng pamamaraan `%.250s' -- %s"
 
-#: dselect/methparse.cc:59
+#: dselect/methparse.cc
 #, c-format
 msgid "error reading options file `%.250s'"
 msgstr "error sa pagbasa ng talaksang opsyon `%.250s'"
 
-#: dselect/methparse.cc:93
+#: dselect/methparse.cc
 #, c-format
 msgid "unable to read `%.250s' directory for reading methods"
 msgstr "di mabasa ang `%.250s' na directory para sa pamamaraan ng pagbasa"
 
-#: dselect/methparse.cc:109
+#: dselect/methparse.cc
 #, c-format
 msgid "method `%.250s' has name that is too long (%d > %d characters)"
 msgstr ""
 "pamamaraan `%.250s' ay may pangalan na labis ang haba (%d > %d karakter)"
 
-#: dselect/methparse.cc:120
+#: dselect/methparse.cc
 #, c-format
 msgid "unable to access method script `%.250s'"
 msgstr "di ma-akses ang script ng pamamaraan `%.250s'"
 
-#: dselect/methparse.cc:126
+#: dselect/methparse.cc
 #, c-format
 msgid "unable to read method options file `%.250s'"
 msgstr "di mabasa ang talaksang opsyon ng pamamaraan `%.250s'"
 
-#: dselect/methparse.cc:150
+#: dselect/methparse.cc
 msgid "non-digit where digit wanted"
 msgstr "di-numero saan numero dapat"
 
-#: dselect/methparse.cc:153
-msgid "EOF in index string"
+#: dselect/methparse.cc
+#, fuzzy
+#| msgid "EOF in index string"
+msgid "end of file in index string"
 msgstr "EOF sa index string"
 
-#: dselect/methparse.cc:156
+#: dselect/methparse.cc
 msgid "index string too long"
 msgstr "labis ang haba ng index string"
 
-#: dselect/methparse.cc:159
+#: dselect/methparse.cc
 msgid "newline before option name start"
 msgstr "newline bago sa umpisa ng pangalan ng opsyon"
 
-#: dselect/methparse.cc:161
-msgid "EOF before option name start"
-msgstr "EOF nauna sa umpisa ang pangalan ng opsyon"
+#: dselect/methparse.cc
+#, fuzzy
+#| msgid "newline before option name start"
+msgid "end of file before option name start"
+msgstr "newline bago sa umpisa ng pangalan ng opsyon"
 
-#: dselect/methparse.cc:165
+#: dselect/methparse.cc
 msgid "nonalpha where option name start wanted"
 msgstr "di-alpha kung saan dapat magumpisa ang pangalan ng opsyon"
 
-#: dselect/methparse.cc:167
+#: dselect/methparse.cc
 msgid "non-alphanum in option name"
 msgstr "di-alphanum sa pangalan ng opsyon"
 
-#: dselect/methparse.cc:170
-msgid "EOF in option name"
+#: dselect/methparse.cc
+#, fuzzy
+#| msgid "EOF in option name"
+msgid "end of file in option name"
 msgstr "EOF sa pangalan ng opsyon"
 
-#: dselect/methparse.cc:175
+#: dselect/methparse.cc
 msgid "newline before summary"
 msgstr "newline bago sa paglalahat"
 
-#: dselect/methparse.cc:177
-msgid "EOF before summary"
-msgstr "EOF nauna sa paglalahat"
+#: dselect/methparse.cc
+#, fuzzy
+#| msgid "newline before summary"
+msgid "end of file before summary"
+msgstr "newline bago sa paglalahat"
 
-#: dselect/methparse.cc:183
-msgid "EOF in summary - missing newline"
+#: dselect/methparse.cc
+#, fuzzy
+#| msgid "EOF in summary - missing newline"
+msgid "end of file in summary - missing newline"
 msgstr "EOF sa paglalahat - kulang ng newline"
 
-#: dselect/methparse.cc:193
+#: dselect/methparse.cc
 #, c-format
 msgid "unable to open option description file `%.250s'"
 msgstr "di mabuksan ang talaksang opsyon na paglalarawan `%.250s'"
 
-#: dselect/methparse.cc:197
+#: dselect/methparse.cc
 #, c-format
 msgid "unable to stat option description file `%.250s'"
 msgstr "di ma-stat ang talaksang opsyon na paglalarawan `%.250s'"
 
-#: dselect/methparse.cc:201
+#: dselect/methparse.cc
 #, c-format
 msgid "failed to read option description file `%.250s'"
 msgstr "bigo sa pagbasa ng talaksang opsyon na paglalarawan `%.250s'"
 
-#: dselect/methparse.cc:204
+#: dselect/methparse.cc
 #, c-format
 msgid "error during read of option description file `%.250s'"
 msgstr "error habang binabasa ang talaksang opsyon na paglalarawan `%.250s'"
 
-#: dselect/methparse.cc:227
+#: dselect/methparse.cc
 #, c-format
 msgid "error during read of method options file `%.250s'"
 msgstr "error habang binabasa ang talaksang opsyon ng pamamaraan `%.250s'"
 
-#: dselect/methparse.cc:250
+#: dselect/methparse.cc
 #, c-format
 msgid "unable to open current option file `%.250s'"
 msgstr "di mabuksan ang kasalukuyang talaksang opsyon `%.250s'"
 
-#: dselect/methparse.cc:286
+#: dselect/methparse.cc
 #, c-format
 msgid "unable to write new option to `%.250s'"
 msgstr "di maisulat ang bagong opsyon sa `%.250s'"
 
-#: dselect/pkgdisplay.cc:36
+#: dselect/pkgdisplay.cc
 msgid "new package"
 msgstr "bagong pakete"
 
-#: dselect/pkgdisplay.cc:37
+#: dselect/pkgdisplay.cc
 msgid "install"
 msgstr "iluklok"
 
-#: dselect/pkgdisplay.cc:38
+#: dselect/pkgdisplay.cc
 msgid "hold"
 msgstr "hawakan"
 
-#: dselect/pkgdisplay.cc:39
+#: dselect/pkgdisplay.cc
 msgid "remove"
 msgstr "tanggalin"
 
-#: dselect/pkgdisplay.cc:40
+#: dselect/pkgdisplay.cc
 msgid "purge"
 msgstr "purga"
 
@@ -1282,331 +1299,325 @@ msgstr "purga"
 #. * the empty string to store information about the translation. DO NOT
 #. * CHANGE THAT IN A TRANSLATION! The code really relies on that being
 #. * a single space.
-#: dselect/pkgdisplay.cc:47
+#: dselect/pkgdisplay.cc
 msgid " "
 msgstr " "
 
-#: dselect/pkgdisplay.cc:48
+#: dselect/pkgdisplay.cc
 msgid "REINSTALL"
 msgstr "ILUKLOK MULI"
 
-#: dselect/pkgdisplay.cc:51
+#: dselect/pkgdisplay.cc
 msgid "not installed"
 msgstr "hindi nakaluklok"
 
-#: dselect/pkgdisplay.cc:52
+#: dselect/pkgdisplay.cc
 msgid "removed (configs remain)"
 msgstr "tinanggal (naiwan ang pagkaayos)"
 
-#: dselect/pkgdisplay.cc:53
+#: dselect/pkgdisplay.cc
 msgid "half installed"
 msgstr "bitin na pagluklok"
 
-#: dselect/pkgdisplay.cc:54
+#: dselect/pkgdisplay.cc
 msgid "unpacked (not set up)"
 msgstr "nakabuklat (hindi nakaayos)"
 
-#: dselect/pkgdisplay.cc:55
+#: dselect/pkgdisplay.cc
 msgid "half configured (config failed)"
 msgstr ""
 
-#: dselect/pkgdisplay.cc:56
+#: dselect/pkgdisplay.cc
 msgid "awaiting trigger processing"
 msgstr ""
 
-#: dselect/pkgdisplay.cc:57
+#: dselect/pkgdisplay.cc
 msgid "triggered"
 msgstr ""
 
-#: dselect/pkgdisplay.cc:58
+#: dselect/pkgdisplay.cc
 msgid "installed"
 msgstr "nakaluklok"
 
-#: dselect/pkgdisplay.cc:61
+#: dselect/pkgdisplay.cc
 msgid "Required"
 msgstr "Kailangan"
 
-#: dselect/pkgdisplay.cc:62
+#: dselect/pkgdisplay.cc
 msgid "Important"
 msgstr "Importante"
 
-#: dselect/pkgdisplay.cc:63
+#: dselect/pkgdisplay.cc
 msgid "Standard"
 msgstr "Standard"
 
-#: dselect/pkgdisplay.cc:64
+#: dselect/pkgdisplay.cc
 msgid "Optional"
 msgstr "Opsyonal"
 
-#: dselect/pkgdisplay.cc:65
+#: dselect/pkgdisplay.cc
 msgid "Extra"
 msgstr "Extra"
 
-#: dselect/pkgdisplay.cc:66
-msgid "!Bug!"
-msgstr "!Bug!"
-
-#: dselect/pkgdisplay.cc:67
+#: dselect/pkgdisplay.cc
 msgid "Unclassified"
 msgstr "Di naka-uri"
 
-#: dselect/pkgdisplay.cc:70
+#: dselect/pkgdisplay.cc
 msgid "suggests"
 msgstr "nagmumungkahi"
 
-#: dselect/pkgdisplay.cc:71
+#: dselect/pkgdisplay.cc
 msgid "recommends"
 msgstr "rekomendado"
 
-#: dselect/pkgdisplay.cc:72
+#: dselect/pkgdisplay.cc
 msgid "depends on"
 msgstr "umaasa sa"
 
-#: dselect/pkgdisplay.cc:73
+#: dselect/pkgdisplay.cc
 msgid "pre-depends on"
 msgstr "umaasa ng lubos sa"
 
-#: dselect/pkgdisplay.cc:74
+#: dselect/pkgdisplay.cc
 msgid "breaks"
 msgstr ""
 
-#: dselect/pkgdisplay.cc:75
+#: dselect/pkgdisplay.cc
 msgid "conflicts with"
 msgstr "katunggali ang"
 
-#: dselect/pkgdisplay.cc:76
+#: dselect/pkgdisplay.cc
 msgid "provides"
 msgstr "nagbibigay ng"
 
-#: dselect/pkgdisplay.cc:77
+#: dselect/pkgdisplay.cc
 msgid "replaces"
 msgstr "kapalit ng"
 
-#: dselect/pkgdisplay.cc:78
+#: dselect/pkgdisplay.cc
 msgid "enhances"
 msgstr "nagpapahusay sa"
 
-#: dselect/pkgdisplay.cc:81
+#: dselect/pkgdisplay.cc
 msgid "Req"
 msgstr "Req"
 
-#: dselect/pkgdisplay.cc:82
+#: dselect/pkgdisplay.cc
 msgid "Imp"
 msgstr "Imp"
 
-#: dselect/pkgdisplay.cc:83
+#: dselect/pkgdisplay.cc
 msgid "Std"
 msgstr "Std"
 
-#: dselect/pkgdisplay.cc:84
+#: dselect/pkgdisplay.cc
 msgid "Opt"
 msgstr "Opt"
 
-#: dselect/pkgdisplay.cc:85
+#: dselect/pkgdisplay.cc
 msgid "Xtr"
 msgstr "Xtr"
 
-#: dselect/pkgdisplay.cc:86
+#: dselect/pkgdisplay.cc
 msgid "bUG"
 msgstr "bUg"
 
-#: dselect/pkgdisplay.cc:87
+#: dselect/pkgdisplay.cc
 msgid "?"
 msgstr "?"
 
-#: dselect/pkgdisplay.cc:95 dselect/pkgdisplay.cc:115
+#: dselect/pkgdisplay.cc
 msgid "Broken"
 msgstr "Sira"
 
-#: dselect/pkgdisplay.cc:96
+#: dselect/pkgdisplay.cc
 msgid "New"
 msgstr "Bago"
 
-#: dselect/pkgdisplay.cc:97
-msgid "Updated"
-msgstr "May Mas Bago"
+#: dselect/pkgdisplay.cc
+msgid "Upgradable"
+msgstr ""
 
-#: dselect/pkgdisplay.cc:98
+#: dselect/pkgdisplay.cc
 msgid "Obsolete/local"
 msgstr "Laos/lokal"
 
-#: dselect/pkgdisplay.cc:99
-msgid "Up-to-date"
-msgstr "Kasalukuyan"
+#: dselect/pkgdisplay.cc
+msgid "Installed"
+msgstr "Linuklok"
 
-#: dselect/pkgdisplay.cc:100
+#: dselect/pkgdisplay.cc
 msgid "Available"
 msgstr "Magagamit"
 
-#: dselect/pkgdisplay.cc:101 dselect/pkgdisplay.cc:117
+#: dselect/pkgdisplay.cc
 msgid "Removed"
 msgstr "Tinanggal"
 
-#: dselect/pkgdisplay.cc:102 dselect/pkgdisplay.cc:111
+#: dselect/pkgdisplay.cc
 msgid "Brokenly installed packages"
 msgstr "Sira ang pagkaluklok na mga pakete"
 
-#: dselect/pkgdisplay.cc:103
+#: dselect/pkgdisplay.cc
 msgid "Newly available packages"
 msgstr "Bagong magagamit na mga pakete"
 
-#: dselect/pkgdisplay.cc:104
-msgid "Updated packages (newer version is available)"
-msgstr "Makabagong mga pakete (may bagong bersyong magagamit)"
+#: dselect/pkgdisplay.cc
+#, fuzzy
+#| msgid "Newly available packages"
+msgid "Upgradable packages"
+msgstr "Bagong magagamit na mga pakete"
 
-#: dselect/pkgdisplay.cc:105
-msgid "Obsolete and local packages present on system"
+#: dselect/pkgdisplay.cc
+#, fuzzy
+#| msgid "Obsolete and local packages present on system"
+msgid "Obsolete and locally created packages"
 msgstr "Laos na at mga lokal na pakete na narito sa sistema"
 
-#: dselect/pkgdisplay.cc:106
-msgid "Up to date installed packages"
-msgstr "Nakaluklok na mga pakete na hindi laos"
+#: dselect/pkgdisplay.cc
+msgid "Installed packages"
+msgstr "Nakaluklok na mga pakete"
 
-#: dselect/pkgdisplay.cc:107
-msgid "Available packages (not currently installed)"
-msgstr "Magagamit na mga pakete (hindi nakaluklok sa kasalukuyan)"
+#: dselect/pkgdisplay.cc
+#, fuzzy
+#| msgid "Up to date installed packages"
+msgid "Available not installed packages"
+msgstr "Nakaluklok na mga pakete na hindi laos"
 
-#: dselect/pkgdisplay.cc:108
+#: dselect/pkgdisplay.cc
 msgid "Removed and no longer available packages"
 msgstr "Tinanggal at hindi na magagamit na mga pakete"
 
-#: dselect/pkgdisplay.cc:112
-msgid "Installed packages"
-msgstr "Nakaluklok na mga pakete"
-
-#: dselect/pkgdisplay.cc:113
+#: dselect/pkgdisplay.cc
 msgid "Removed packages (configuration still present)"
 msgstr "Tinanggal na mga pakete (pagkaayos ay narito pa)"
 
-#: dselect/pkgdisplay.cc:114
+#: dselect/pkgdisplay.cc
 msgid "Purged packages and those never installed"
 msgstr "Pinurgang mga pakete at mga hindi kailanman naluklok"
 
-#: dselect/pkgdisplay.cc:116
-msgid "Installed"
-msgstr "Linuklok"
-
-#: dselect/pkgdisplay.cc:118
+#: dselect/pkgdisplay.cc
 msgid "Purged"
 msgstr "Pinurga"
 
-#: dselect/pkgdisplay.cc:138
+#: dselect/pkgdisplay.cc
 msgid "Error"
 msgstr "Error"
 
-#: dselect/pkgdisplay.cc:139
+#: dselect/pkgdisplay.cc
 msgid "Installed?"
 msgstr "Naka-luklok?"
 
-#: dselect/pkgdisplay.cc:140
+#: dselect/pkgdisplay.cc
 msgid "Old mark"
 msgstr "Lumang marka"
 
-#: dselect/pkgdisplay.cc:141
+#: dselect/pkgdisplay.cc
 msgid "Marked for"
 msgstr "Markado para"
 
-#: dselect/pkgdisplay.cc:143
+#: dselect/pkgdisplay.cc
 msgid "EIOM"
 msgstr "EILM"
 
-#: dselect/pkgdisplay.cc:147 dselect/pkgdisplay.cc:150
+#: dselect/pkgdisplay.cc
 msgid "Section"
 msgstr "Section"
 
-#: dselect/pkgdisplay.cc:148
+#: dselect/pkgdisplay.cc
 msgid "Priority"
 msgstr "Prioridad"
 
-#: dselect/pkgdisplay.cc:152
+#: dselect/pkgdisplay.cc
 msgid "Package"
 msgstr "Pakete"
 
-#: dselect/pkgdisplay.cc:161 dselect/pkgdisplay.cc:165
+#: dselect/pkgdisplay.cc
 #, fuzzy
 #| msgid "Avail.ver"
 msgid "Avail.arch"
 msgstr "Avail.ber"
 
-#: dselect/pkgdisplay.cc:164
+#: dselect/pkgdisplay.cc
 #, fuzzy
 #| msgid "Inst.ver"
 msgid "Inst.arch"
 msgstr "Inst.ber"
 
-#: dselect/pkgdisplay.cc:178 dselect/pkgdisplay.cc:182
+#: dselect/pkgdisplay.cc
 msgid "Avail.ver"
 msgstr "Avail.ber"
 
-#: dselect/pkgdisplay.cc:181
+#: dselect/pkgdisplay.cc
 msgid "Inst.ver"
 msgstr "Inst.ber"
 
-#: dselect/pkgdisplay.cc:197
+#: dselect/pkgdisplay.cc
 msgid "dselect - recursive package listing"
 msgstr "dselect - listahan ng mga pakete na recursive"
 
-#: dselect/pkgdisplay.cc:199
+#: dselect/pkgdisplay.cc
 msgid "dselect - inspection of package states"
 msgstr "dselect - pagsuri ng kalagayan ng mga pakete"
 
-#: dselect/pkgdisplay.cc:200
+#: dselect/pkgdisplay.cc
 msgid "dselect - main package listing"
 msgstr "dselect - pangunahing listahan ng mga pakete"
 
-#: dselect/pkgdisplay.cc:208
+#: dselect/pkgdisplay.cc
 msgid " (by section)"
 msgstr " (ayon sa seksyon)"
 
-#: dselect/pkgdisplay.cc:211
+#: dselect/pkgdisplay.cc
 msgid " (avail., section)"
 msgstr " (magagamit, seksyon)"
 
-#: dselect/pkgdisplay.cc:214
+#: dselect/pkgdisplay.cc
 msgid " (status, section)"
 msgstr " (kalagayan, seksyon)"
 
-#: dselect/pkgdisplay.cc:223
+#: dselect/pkgdisplay.cc
 msgid " (by priority)"
 msgstr " (ayon sa prioridad)"
 
-#: dselect/pkgdisplay.cc:226
+#: dselect/pkgdisplay.cc
 msgid " (avail., priority)"
 msgstr " (magagamit, prioridad)"
 
-#: dselect/pkgdisplay.cc:229
+#: dselect/pkgdisplay.cc
 msgid " (status, priority)"
 msgstr " (kalagayan, prioridad)"
 
-#: dselect/pkgdisplay.cc:238
+#: dselect/pkgdisplay.cc
 msgid " (alphabetically)"
 msgstr " (ayon sa abakada)"
 
-#: dselect/pkgdisplay.cc:241
+#: dselect/pkgdisplay.cc
 msgid " (by availability)"
 msgstr " (ayon sa magagamit)"
 
-#: dselect/pkgdisplay.cc:244
+#: dselect/pkgdisplay.cc
 msgid " (by status)"
 msgstr " (ayon sa kalagayan)"
 
-#: dselect/pkgdisplay.cc:259
+#: dselect/pkgdisplay.cc
 msgid " mark:+/=/- terse:v help:?"
 msgstr " markahan:+/=/- maikli:v tulong:?"
 
-#: dselect/pkgdisplay.cc:260
+#: dselect/pkgdisplay.cc
 msgid " mark:+/=/- verbose:v help:?"
 msgstr " markahan:+/=/- maligoy:v tulong:?"
 
-#: dselect/pkgdisplay.cc:262
+#: dselect/pkgdisplay.cc
 msgid " terse:v help:?"
 msgstr " maikli:v tulong:?"
 
-#: dselect/pkgdisplay.cc:263
+#: dselect/pkgdisplay.cc
 msgid " verbose:v help:?"
 msgstr " maligoy:v tulong:?"
 
-#: dselect/pkginfo.cc:85
+#: dselect/pkginfo.cc
 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 "
@@ -1629,86 +1640,118 @@ msgstr ""
 "pakete\n"
 "sa iba't ibang uri ng pag-grupo."
 
-#: dselect/pkginfo.cc:98
+#: dselect/pkginfo.cc
 #, fuzzy
 msgid "Interrelationships"
 msgstr "mga kaugnayan"
 
-#: dselect/pkginfo.cc:117
+#: dselect/pkginfo.cc
 #, fuzzy
 msgid "No description available."
 msgstr "walang paglalarawan na magagamit."
 
-#: dselect/pkginfo.cc:135
+#: dselect/pkginfo.cc
 #, fuzzy
 msgid "Installed control file information"
 msgstr "naka-luklok na impormasyong control para sa "
 
-#: dselect/pkginfo.cc:151
+#: dselect/pkginfo.cc
 #, fuzzy
 msgid "Available control file information"
 msgstr "magagamit na bersyon ng impormasyon ng talaksang control"
 
-#: dselect/pkglist.cc:425
+#: dselect/pkglist.cc
 #, fuzzy
 #| msgid "Installed packages"
 msgid "there are no packages"
 msgstr "Nakaluklok na mga pakete"
 
-#: dselect/pkglist.cc:521
+#: dselect/pkglist.cc
 msgid "invalid search option given"
 msgstr "di tanggap na opsyon sa paghahanap ay ibinigay"
 
-#: dselect/pkglist.cc:536
+#: dselect/pkglist.cc
 msgid "error in regular expression"
 msgstr "error sa regular expression"
 
-#: dselect/pkgsublist.cc:111
+#: dselect/pkgsublist.cc
 msgid " does not appear to be available\n"
 msgstr " ay mukhang hindi magagamit\n"
 
-#: dselect/pkgsublist.cc:131
+#: dselect/pkgsublist.cc
 msgid " or "
 msgstr " o "
 
-#: dselect/pkgtop.cc:58
+#: dselect/pkgtop.cc
 msgid "All"
 msgstr "Lahat"
 
-#: dselect/pkgtop.cc:80
+#: dselect/pkgtop.cc
 msgid "All packages"
 msgstr "Lahat ng mga pakete"
 
-#: dselect/pkgtop.cc:84
+#: dselect/pkgtop.cc
 #, c-format
 msgid "%s packages without a section"
 msgstr "%s na pakete na walang seksyon"
 
-#: dselect/pkgtop.cc:86
+#: dselect/pkgtop.cc
 #, c-format
 msgid "%s packages in section %s"
 msgstr "%s na pakete sa seksyon %s"
 
-#: dselect/pkgtop.cc:92
+#: dselect/pkgtop.cc
 #, c-format
 msgid "%s %s packages"
 msgstr "%s %s na pakete"
 
-#: dselect/pkgtop.cc:96
+#: dselect/pkgtop.cc
 #, c-format
 msgid "%s %s packages without a section"
 msgstr "%s %s na pakete na walang seksyon"
 
-#: dselect/pkgtop.cc:98
+#: dselect/pkgtop.cc
 #, c-format
 msgid "%s %s packages in section %s"
 msgstr "%s %s na pakete sa seksyon %s"
 
-#: dselect/pkgtop.cc:119
+#: dselect/pkgtop.cc
 #, c-format
 msgid "%-*s %s%s%s;  %s (was: %s).  %s"
 msgstr "%-*s %s%s%s; %s (dati ay: %s).  %s"
 
+#, fuzzy
+#~| msgid "Section"
+#~ msgid "Actions:\n"
+#~ msgstr "Section"
+
+#~ msgid "Colours:\n"
+#~ msgstr "Colours/Mga kulay:\n"
+
+#~ msgid "Attributes:\n"
+#~ msgstr "Mga attribute:\n"
+
+#~ msgid "EOF before option name start"
+#~ msgstr "EOF nauna sa umpisa ang pangalan ng opsyon"
+
+#~ msgid "EOF before summary"
+#~ msgstr "EOF nauna sa paglalahat"
+
+#~ msgid "!Bug!"
+#~ msgstr "!Bug!"
+
+#~ msgid "Updated"
+#~ msgstr "May Mas Bago"
+
+#~ msgid "Up-to-date"
+#~ msgstr "Kasalukuyan"
+
+#~ msgid "Updated packages (newer version is available)"
+#~ msgstr "Makabagong mga pakete (may bagong bersyong magagamit)"
+
+#~ msgid "Available packages (not currently installed)"
+#~ msgstr "Magagamit na mga pakete (hindi nakaluklok sa kasalukuyan)"
+
 #~ msgid "unable to open new option file `%.250s'"
 #~ msgstr "di mabuksan ang bagong talaksang opsyon `%.250s'"
 
diff --git a/dselect/po/vi.po b/dselect/po/vi.po
index 1649d36f7..0808aee0b 100644
--- a/dselect/po/vi.po
+++ b/dselect/po/vi.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dselect 1.17.22\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2014-12-23 18:12+0100\n"
+"POT-Creation-Date: 2015-04-06 09:37+0200\n"
 "PO-Revision-Date: 2014-12-01 08:20+0700\n"
 "Last-Translator: Trần Ngọc Quân <vnwildman@gmail.com>\n"
 "Language-Team: Vietnamese <debian-l10n-vietnamese@lists.debian.org>\n"
@@ -18,29 +18,29 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: dselect/basecmds.cc:125
+#: dselect/basecmds.cc
 msgid "Search for ? "
 msgstr "Tìm kiếm ? "
 
-#: dselect/basecmds.cc:149
+#: dselect/basecmds.cc
 msgid "Error: "
 msgstr "Lỗi: "
 
-#: dselect/basecmds.cc:180
+#: dselect/basecmds.cc
 msgid "Help: "
 msgstr "Trợ giúp: "
 
-#: dselect/basecmds.cc:186
+#: dselect/basecmds.cc
 msgid "Press ? for help menu, . for next topic, <space> to exit help."
 msgstr ""
 "Nhấn ? để hiện trình đơn trợ giúp, . để xem chủ đề tiếp theo\n"
 "“phím cách” để thoát khỏi trợ giúp."
 
-#: dselect/basecmds.cc:193
+#: dselect/basecmds.cc
 msgid "Help information is available under the following topics:"
 msgstr "Có sẵn thông tin trợ giúp dưới những chủ đề sau :"
 
-#: dselect/basecmds.cc:201
+#: dselect/basecmds.cc
 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. "
@@ -49,239 +49,239 @@ msgstr ""
 "phím cách hoặc phím q để thoát, hoặc\n"
 "dấu chấm để đọc mỗi trang trợ giúp lần lượt. "
 
-#: dselect/basecmds.cc:207
+#: dselect/basecmds.cc
 msgid "error reading keyboard in help"
 msgstr "gặp lỗi khi đọc bàn phím trong trợ giúp"
 
-#: dselect/baselist.cc:60
+#: dselect/baselist.cc
 msgid "ioctl(TIOCGWINSZ) failed"
 msgstr "ioctl(TIOCGWINSZ) thất bại"
 
-#: dselect/baselist.cc:63
+#: dselect/baselist.cc
 msgid "doupdate in SIGWINCH handler failed"
 msgstr "doupdate (chạy cập nhật) trong phần điều khiển SIGWINCH bị lỗi"
 
-#: dselect/baselist.cc:72
+#: dselect/baselist.cc
 msgid "failed to restore old SIGWINCH sigact"
 msgstr "gặp lỗi khi phục hồi SIGWINCH sigact cũ"
 
-#: dselect/baselist.cc:75
+#: dselect/baselist.cc
 msgid "failed to restore old signal mask"
 msgstr "gặp lỗi khi phục hồi mặt nạ tín hiệu"
 
-#: dselect/baselist.cc:86
+#: dselect/baselist.cc
 msgid "failed to get old signal mask"
 msgstr "gặp lỗi khi lấy mặt nạ tín hiệu cũ"
 
-#: dselect/baselist.cc:88
+#: dselect/baselist.cc
 msgid "failed to get old SIGWINCH sigact"
 msgstr "việc lấy mặt nạ SIGWINCH sigact cũ bị lỗi"
 
-#: dselect/baselist.cc:93
+#: dselect/baselist.cc
 msgid "failed to block SIGWINCH"
 msgstr "việc ngăn chặn SIGWINCH bị lỗi"
 
-#: dselect/baselist.cc:99
+#: dselect/baselist.cc
 msgid "failed to set new SIGWINCH sigact"
 msgstr "việc đặt SIGWINCH sigact mới bị lỗi"
 
-#: dselect/baselist.cc:174
+#: dselect/baselist.cc
 msgid "failed to allocate colour pair"
 msgstr "viếc cấp phát cặp màu bị lỗi"
 
-#: dselect/baselist.cc:203
+#: dselect/baselist.cc
 msgid "failed to create title window"
 msgstr "việc tạo cửa sổ tiêu đề bị lỗi"
 
-#: dselect/baselist.cc:207
+#: dselect/baselist.cc
 msgid "failed to create whatinfo window"
 msgstr "việc tạo cửa sổ whatinfo (thông tin nào?) bị lỗi"
 
-#: dselect/baselist.cc:211
+#: dselect/baselist.cc
 msgid "failed to create baselist pad"
 msgstr "gặp lỗi khi tạo phần đệm baselist (danh sách cơ bản)"
 
-#: dselect/baselist.cc:214
+#: dselect/baselist.cc
 msgid "failed to create heading pad"
 msgstr "việc tạo phần đệm heading (tiêu đề) bị lỗi"
 
-#: dselect/baselist.cc:218
+#: dselect/baselist.cc
 msgid "failed to create thisstate pad"
 msgstr "việc tạo phần đệm thisstate (tính trạng này) bị lỗi"
 
-#: dselect/baselist.cc:222
+#: dselect/baselist.cc
 msgid "failed to create info pad"
 msgstr "việc tạo phần đệm info (thông tin) bị lỗi"
 
-#: dselect/baselist.cc:227
+#: dselect/baselist.cc
 msgid "failed to create query window"
 msgstr "việc tạo cửa sổ truy vấn bị lỗi"
 
-#: dselect/baselist.cc:298
+#: dselect/baselist.cc
 msgid "Keybindings"
 msgstr "Tổ hợp phím"
 
-#: dselect/baselist.cc:347
+#: dselect/baselist.cc
 #, c-format
 msgid "  -- %d%%, press "
 msgstr "  -- %d%%, nhấn "
 
-#: dselect/baselist.cc:350
+#: dselect/baselist.cc
 #, c-format
 msgid "%s for more"
 msgstr "%s để xem thêm"
 
-#: dselect/baselist.cc:354
+#: dselect/baselist.cc
 #, c-format
 msgid "%s to go back"
 msgstr "%s để quay lại"
 
-#: dselect/bindings.cc:78
+#: dselect/bindings.cc
 msgid "[not bound]"
 msgstr "[không có tổ hợp]"
 
-#: dselect/bindings.cc:82
+#: dselect/bindings.cc
 #, c-format
 msgid "[unk: %d]"
 msgstr "[không rõ: %d]"
 
-#: dselect/bindings.cc:141
+#: dselect/bindings.cc
 msgid "Scroll onwards through help/information"
 msgstr "Cuộn về phía trước trong trợ giúp/thông tin"
 
-#: dselect/bindings.cc:142
+#: dselect/bindings.cc
 msgid "Scroll backwards through help/information"
 msgstr "Cuộn ngược lại trong trợ giúp/thông tin"
 
-#: dselect/bindings.cc:143
+#: dselect/bindings.cc
 msgid "Move up"
 msgstr "Đi lên"
 
-#: dselect/bindings.cc:144
+#: dselect/bindings.cc
 msgid "Move down"
 msgstr "Đi xuống"
 
-#: dselect/bindings.cc:145
+#: dselect/bindings.cc
 msgid "Go to top of list"
 msgstr "Đi tới đầu danh sách"
 
-#: dselect/bindings.cc:146
+#: dselect/bindings.cc
 msgid "Go to end of list"
 msgstr "Đi tới cuối danh sách"
 
-#: dselect/bindings.cc:147
+#: dselect/bindings.cc
 msgid "Request help (cycle through help screens)"
 msgstr "Yêu cầu trợ giúp (quay vòng qua các màn hình trợ giúp)"
 
-#: dselect/bindings.cc:148
+#: dselect/bindings.cc
 msgid "Cycle through information displays"
 msgstr "Quay vòng qua các màn hình thông tin"
 
-#: dselect/bindings.cc:149
+#: dselect/bindings.cc
 msgid "Redraw display"
 msgstr "Vẽ lại màn hình"
 
-#: dselect/bindings.cc:150
+#: dselect/bindings.cc
 msgid "Scroll onwards through list by 1 line"
 msgstr "Cuộn về phía trước trong danh sách 1 dòng"
 
-#: dselect/bindings.cc:151
+#: dselect/bindings.cc
 msgid "Scroll backwards through list by 1 line"
 msgstr "Cuộn ngược lại trong danh sách 1 dòng"
 
-#: dselect/bindings.cc:152
+#: dselect/bindings.cc
 msgid "Scroll onwards through help/information by 1 line"
 msgstr "Cuộn về phía trước trong trợ giúp/thông tin 1 dòng"
 
-#: dselect/bindings.cc:153
+#: dselect/bindings.cc
 msgid "Scroll backwards through help/information by 1 line"
 msgstr "Cuộn ngược lại trong trợ giúp/thông tin 1 dòng"
 
-#: dselect/bindings.cc:154
+#: dselect/bindings.cc
 msgid "Scroll onwards through list"
 msgstr "Cuộn về phía trước trong danh sách"
 
-#: dselect/bindings.cc:155
+#: dselect/bindings.cc
 msgid "Scroll backwards through list"
 msgstr "Cuộn ngược lại trong danh sách"
 
-#: dselect/bindings.cc:158
+#: dselect/bindings.cc
 msgid "Mark package(s) for installation"
 msgstr "Đánh dấu (các) gói để cài đặt"
 
-#: dselect/bindings.cc:159
+#: dselect/bindings.cc
 msgid "Mark package(s) for deinstallation"
 msgstr "Đánh dấu (các) gói để hủy cài đặt"
 
-#: dselect/bindings.cc:160
+#: dselect/bindings.cc
 msgid "Mark package(s) for deinstall and purge"
 msgstr "Đánh dấu (các) gói để hủy cài đặt và tẩy"
 
-#: dselect/bindings.cc:161
+#: dselect/bindings.cc
 msgid "Make highlight more specific"
 msgstr "Làm cho tô sáng rõ ràng hơn"
 
-#: dselect/bindings.cc:162
+#: dselect/bindings.cc
 msgid "Make highlight less specific"
 msgstr "Khiến tô sáng ít rõ ràng hơn"
 
-#: dselect/bindings.cc:163
+#: dselect/bindings.cc
 msgid "Search for a package whose name contains a string"
 msgstr "Tìm kiếm một gói mà tên chứa một chuỗi"
 
-#: dselect/bindings.cc:164
+#: dselect/bindings.cc
 msgid "Repeat last search"
 msgstr "Lặp lại tìm kiếm cuối cùng"
 
-#: dselect/bindings.cc:165
+#: dselect/bindings.cc
 msgid "Swap sort order priority/section"
 msgstr "Trao đổi ưu tiên/phần của thứ tự sắp xếp"
 
-#: dselect/bindings.cc:166
+#: dselect/bindings.cc
 msgid "Quit, confirming, and checking dependencies"
 msgstr "Thoát, xác nhận, và kiểm tra phụ thuộc"
 
-#: dselect/bindings.cc:167
+#: dselect/bindings.cc
 msgid "Quit, confirming without check"
 msgstr "Thoát, xác nhận mà không kiểm tra"
 
-#: dselect/bindings.cc:168
+#: dselect/bindings.cc
 msgid "Quit, rejecting conflict/dependency suggestions"
 msgstr "Thoát, từ chối những đề nghị xung đột/phụ thuộc"
 
-#: dselect/bindings.cc:169
+#: dselect/bindings.cc
 msgid "Abort - quit without making changes"
 msgstr "Hủy bỏ — thoát mà không thay đổi gì"
 
-#: dselect/bindings.cc:170
+#: dselect/bindings.cc
 msgid "Revert to old state for all packages"
 msgstr "Đưa mọi gói trở về tính trạng cũ"
 
-#: dselect/bindings.cc:171
+#: dselect/bindings.cc
 msgid "Revert to suggested state for all packages"
 msgstr "Đưa mọi gói trở về tính trạng đã đề nghị"
 
-#: dselect/bindings.cc:172
+#: dselect/bindings.cc
 msgid "Revert to directly requested state for all packages"
 msgstr "Đưa mọi gói trở về tính trạng đã đề nghị thẳng"
 
-#: dselect/bindings.cc:173
+#: dselect/bindings.cc
 msgid "Revert to currently installed state for all packages"
 msgstr "Đưa mọi gói trở về tình trạng đã cài"
 
-#: dselect/bindings.cc:176
+#: dselect/bindings.cc
 msgid "Select currently-highlighted access method"
 msgstr "Chọn phương thức truy cập đang được tô sáng"
 
-#: dselect/bindings.cc:177
+#: dselect/bindings.cc
 msgid "Quit without changing selected access method"
 msgstr "Thoát mà không thay đổi phương thức truy cập đã chọn"
 
-#: dselect/helpmsgs.cc:29
+#: dselect/helpmsgs.cc
 msgid "Keystrokes"
 msgstr "Phím tắt"
 
-#: dselect/helpmsgs.cc:29
+#: dselect/helpmsgs.cc
 msgid ""
 "Motion keys: Next/Previous, Top/End, Up/Down, Backwards/Forwards:\n"
 "  j, Down-arrow         k, Up-arrow             move highlight\n"
@@ -347,11 +347,11 @@ msgstr ""
 "   D       đặt tất cả thành trạng thái Yêu cầu trực tiếp\n"
 " n, \\     lặp lại tìm kiếm cuối\n"
 
-#: dselect/helpmsgs.cc:55
+#: dselect/helpmsgs.cc
 msgid "Introduction to package selections"
 msgstr "Giới thiệu sự lựa chọn gói"
 
-#: dselect/helpmsgs.cc:55
+#: dselect/helpmsgs.cc
 msgid ""
 "Welcome to dselect's main package listing.\n"
 "\n"
@@ -405,11 +405,11 @@ msgstr ""
 "\n"
 "Lúc này, bạn nhấn phím dài để dời khỏi trợ giúp và đi vào danh sách.\n"
 
-#: dselect/helpmsgs.cc:80
+#: dselect/helpmsgs.cc
 msgid "Introduction to read-only package list browser"
 msgstr "Giới thiệu bộ duyệt danh sách gói chỉ đọc"
 
-#: dselect/helpmsgs.cc:80
+#: dselect/helpmsgs.cc
 msgid ""
 "Welcome to dselect's main package listing.\n"
 "\n"
@@ -445,11 +445,11 @@ msgstr ""
 "\n"
 "Lúc này, bạn nhấn phím dài để dời khỏi trợ giúp và đi vào danh sách.\n"
 
-#: dselect/helpmsgs.cc:99
+#: dselect/helpmsgs.cc
 msgid "Introduction to conflict/dependency resolution sub-list"
 msgstr "Giới thiệu danh sách con các giải pháp cho xung đột/phụ thuộc"
 
-#: dselect/helpmsgs.cc:99
+#: dselect/helpmsgs.cc
 msgid ""
 "Dependency/conflict resolution - introduction.\n"
 "\n"
@@ -509,11 +509,11 @@ msgstr ""
 "Lúc này có thể nhấn phím dài để thoát khỏi trợ giúp và xem danh sách con;\n"
 "hãy nhớ : nhấn “?” để xem trợ giúp.\n"
 
-#: dselect/helpmsgs.cc:125
+#: dselect/helpmsgs.cc
 msgid "Display, part 1: package listing and status chars"
 msgstr "Màn hình, phần 1: danh sách gói và ký tự trạng thái"
 
-#: dselect/helpmsgs.cc:125
+#: dselect/helpmsgs.cc
 msgid ""
 "The top half of the screen shows a list of packages.  For each package you "
 "see\n"
@@ -572,11 +572,11 @@ msgstr ""
 "Đồng thời còn hiển thị Ưu tiên, Phần, Tên, phiên bản Đã cài và Có thể cài\n"
 "(phím tắt Shift-V để hiện/ẩn) mỗi gói và mô tả tóm tắt chung.\n"
 
-#: dselect/helpmsgs.cc:152
+#: dselect/helpmsgs.cc
 msgid "Display, part 2: list highlight; information display"
 msgstr "Màn hình, phần 2: tô sáng danh sách; màn hình thông tin"
 
-#: dselect/helpmsgs.cc:152
+#: dselect/helpmsgs.cc
 msgid ""
 "* Highlight: One line in the package list will be highlighted.  It "
 "indicates\n"
@@ -621,11 +621,11 @@ msgstr ""
 "  Dùng phím “i” để chuyển quanh các màn hình, và “I” để ẩn màn hình\n"
 "  thông tin hay mở rộng để nó chiếu gần hết màn hình.\n"
 
-#: dselect/helpmsgs.cc:176
+#: dselect/helpmsgs.cc
 msgid "Introduction to method selection display"
 msgstr "Giới thiệu màn hình chọn phương thức"
 
-#: dselect/helpmsgs.cc:176
+#: dselect/helpmsgs.cc
 msgid ""
 "dselect and dpkg can do automatic installation, loading the package files to "
 "be\n"
@@ -665,11 +665,11 @@ msgstr ""
 "Nhấn phím “k” để xem danh sách đầy đủ các phím tắt,\n"
 "hoặc từ trình đơn trợ giúp bằng cách nhấn phím “?”.\n"
 
-#: dselect/helpmsgs.cc:196
+#: dselect/helpmsgs.cc
 msgid "Keystrokes for method selection"
 msgstr "Phím tắt để chọn phương thức"
 
-#: dselect/helpmsgs.cc:196
+#: dselect/helpmsgs.cc
 msgid ""
 "Motion keys: Next/Previous, Top/End, Up/Down, Backwards/Forwards:\n"
 "  j, Down-arrow         k, Up-arrow             move highlight\n"
@@ -714,104 +714,104 @@ msgstr ""
 "  /                tìm kiếm (chỉ cần Enter để thôi)\n"
 "  \\               lặp lại tìm kiếm cuối cùng\n"
 
-#: dselect/main.cc:63
+#: dselect/main.cc
 msgid "Type dselect --help for help."
 msgstr "Gõ “dselect --help” để xem trợ giúp."
 
-#: dselect/main.cc:145
+#: dselect/main.cc
 msgid "a"
 msgstr "a"
 
-#: dselect/main.cc:145
+#: dselect/main.cc
 msgid "[A]ccess"
 msgstr "[A]Truy cập"
 
-#: dselect/main.cc:145
+#: dselect/main.cc
 msgid "Choose the access method to use."
 msgstr "Chọn phương thức truy cập muốn dùng."
 
-#: dselect/main.cc:146
+#: dselect/main.cc
 msgid "u"
 msgstr "u"
 
-#: dselect/main.cc:146
+#: dselect/main.cc
 msgid "[U]pdate"
 msgstr "[U]Cập nhật"
 
-#: dselect/main.cc:146
+#: dselect/main.cc
 msgid "Update list of available packages, if possible."
 msgstr "Cập nhật danh sách những gói có sẵn, nếu có thể."
 
-#: dselect/main.cc:147
+#: dselect/main.cc
 msgid "s"
 msgstr "s"
 
-#: dselect/main.cc:147
+#: dselect/main.cc
 msgid "[S]elect"
 msgstr "[S]Chọn"
 
-#: dselect/main.cc:147
+#: dselect/main.cc
 msgid "Request which packages you want on your system."
 msgstr "Yêu cầu những gói muốn có trên hệ thống."
 
-#: dselect/main.cc:148
+#: dselect/main.cc
 msgid "i"
 msgstr "i"
 
-#: dselect/main.cc:148
+#: dselect/main.cc
 msgid "[I]nstall"
 msgstr "[I]Cài"
 
-#: dselect/main.cc:148
+#: dselect/main.cc
 msgid "Install and upgrade wanted packages."
 msgstr "Cài đặt và nâng cấp các gói mong muốn."
 
-#: dselect/main.cc:149
+#: dselect/main.cc
 msgid "c"
 msgstr "c"
 
-#: dselect/main.cc:149
+#: dselect/main.cc
 msgid "[C]onfig"
 msgstr "[C]ấu hình"
 
-#: dselect/main.cc:149
+#: dselect/main.cc
 msgid "Configure any packages that are unconfigured."
 msgstr "Cấu hình những gói còn chưa được cấu hình."
 
-#: dselect/main.cc:150
+#: dselect/main.cc
 msgid "r"
 msgstr "r"
 
-#: dselect/main.cc:150
+#: dselect/main.cc
 msgid "[R]emove"
 msgstr "[R]Gỡ bỏ"
 
-#: dselect/main.cc:150
+#: dselect/main.cc
 msgid "Remove unwanted software."
 msgstr "Gỡ bỏ phần mềm không mong muốn."
 
-#: dselect/main.cc:151
+#: dselect/main.cc
 msgid "q"
 msgstr "q"
 
-#: dselect/main.cc:151
+#: dselect/main.cc
 msgid "[Q]uit"
 msgstr "[Q]Thoát"
 
-#: dselect/main.cc:151
+#: dselect/main.cc
 msgid "Quit dselect."
 msgstr "Thoát khỏi dselect."
 
-#: dselect/main.cc:152
+#: dselect/main.cc
 msgid "menu"
 msgstr "trình đơn"
 
-#: dselect/main.cc:157
+#: dselect/main.cc
 #, c-format
 msgid "Debian `%s' package handling frontend version %s.\n"
 msgstr "Ứng dụng xử lý gói Debian “%s” phiên bản %s.\n"
 
-#: dselect/main.cc:160
+#: dselect/main.cc
 msgid ""
 "This is free software; see the GNU General Public License version 2 or\n"
 "later for copying conditions. There is NO warranty.\n"
@@ -820,29 +820,47 @@ msgstr ""
 "phiên bản 2 hoặc mới hơn để biết điều kiện sao chép.\n"
 "KHÔNG có bảo hành gì cả.\n"
 
-#: dselect/main.cc:169 dselect/main.cc:217
+#: dselect/main.cc
 msgid "<standard output>"
 msgstr "<đầu ra tiêu chuẩn>"
 
-#: dselect/main.cc:180
-#, c-format
+#: dselect/main.cc
+#, fuzzy, c-format
+#| msgid ""
+#| "Usage: %s [<option> ...] [<action> ...]\n"
+#| "\n"
 msgid ""
-"Usage: %s [<option> ...] [<action> ...]\n"
+"Usage: %s [<option>...] [<command>...]\n"
 "\n"
 msgstr ""
 "Cách dùng: %s [<tùy_chọn> ...] [<thao_tác> ...]\n"
 "\n"
 
-#: dselect/main.cc:184
+#: dselect/main.cc
 #, c-format
+msgid "Commands:\n"
+msgstr ""
+
+#: dselect/main.cc
+#, fuzzy, c-format
+#| msgid ""
+#| "Options:\n"
+#| "  --admindir <directory>     Use <directory> instead of %s.\n"
+#| "  --expert                   Turn on expert mode.\n"
+#| "  --debug <file> | -D<file>  Turn on debugging, sending output to "
+#| "<file>.\n"
+#| "  --colour | --color screenpart:[foreground],[background][:attr[+attr"
+#| "+...]]\n"
+#| "                             Configure screen colours.\n"
+#| "\n"
 msgid ""
 "Options:\n"
-"  --admindir <directory>     Use <directory> instead of %s.\n"
-"  --expert                   Turn on expert mode.\n"
-"  --debug <file> | -D<file>  Turn on debugging, sending output to <file>.\n"
-"  --colour | --color screenpart:[foreground],[background][:attr[+attr+...]]\n"
-"                             Configure screen colours.\n"
-"\n"
+"      --admindir <directory>       Use <directory> instead of %s.\n"
+"      --expert                     Turn on expert mode.\n"
+"  -D, --debug <file>               Turn on debugging, send output to "
+"<file>.\n"
+"      --color <color-spec>         Configure screen colors.\n"
+"      --colour <color-spec>        Ditto.\n"
 msgstr ""
 "Tùy chọn:\n"
 "  --admindir <thư_mục>       Dùng thư mục này thay cho %s.\n"
@@ -853,72 +871,79 @@ msgstr ""
 "                             Cấu hình màu sắc màn hình\n"
 "\n"
 
-#: dselect/main.cc:193
-#, c-format
+#: dselect/main.cc
+#, fuzzy, c-format
+#| msgid ""
+#| "  --help                     Show this help message.\n"
+#| "  --version                  Show the version.\n"
+#| "\n"
 msgid ""
-"  --help                     Show this help message.\n"
-"  --version                  Show the version.\n"
+"  -?, --help                       Show this help message.\n"
+"      --version                    Show the version.\n"
 "\n"
 msgstr ""
 "  --help                     Hiển thị trợ giúp này.\n"
 "  --version                  Hiển thị phiên bản.\n"
 "\n"
 
-#: dselect/main.cc:197
+#: dselect/main.cc
 #, c-format
-msgid "Actions:\n"
-msgstr "Thao tác:\n"
+msgid ""
+"<color-spec> is <screen-part>:[<foreground>],[<background>][:"
+"<attr>[+<attr>]...]\n"
+msgstr ""
 
-#: dselect/main.cc:202
-#, c-format
-msgid "Screenparts:\n"
+#: dselect/main.cc
+#, fuzzy, c-format
+#| msgid "Screenparts:\n"
+msgid "<screen-part> is:"
 msgstr "Các phần màn hình:\n"
 
-#: dselect/main.cc:207
+#: dselect/main.cc
 #, c-format
-msgid "Colours:\n"
-msgstr "Màu sắc:\n"
+msgid "<color> is:"
+msgstr ""
 
-#: dselect/main.cc:212
+#: dselect/main.cc
 #, c-format
-msgid "Attributes:\n"
-msgstr "Thuộc tính:\n"
+msgid "<attr> is:"
+msgstr ""
 
-#: dselect/main.cc:232
+#: dselect/main.cc
 #, c-format
 msgid "couldn't open debug file `%.255s'\n"
 msgstr "không thể mở tập tin gỡ lỗi “%.250s”\n"
 
-#: dselect/main.cc:253
+#: dselect/main.cc
 #, c-format
 msgid "invalid %s '%s'"
 msgstr "%s “%s” không hợp lệ"
 
-#: dselect/main.cc:272
+#: dselect/main.cc
 msgid "screen part"
 msgstr "phần màn hình"
 
-#: dselect/main.cc:278
+#: dselect/main.cc
 msgid "null colour specification"
 msgstr "đặc tả màu là null"
 
-#: dselect/main.cc:286 dselect/main.cc:291
+#: dselect/main.cc
 msgid "colour"
 msgstr "màu"
 
-#: dselect/main.cc:299
+#: dselect/main.cc
 msgid "colour attribute"
 msgstr "thuộc tính màu"
 
-#: dselect/main.cc:333
+#: dselect/main.cc
 msgid "Terminal does not appear to support cursor addressing.\n"
 msgstr "Thiết bị cuỗi có vẻ không hỗ trợ cách gán địa chỉ cho con chạy.\n"
 
-#: dselect/main.cc:335
+#: dselect/main.cc
 msgid "Terminal does not appear to support highlighting.\n"
 msgstr "Thiết bị cuỗi có vẻ không hỗ trợ tô sáng.\n"
 
-#: dselect/main.cc:337
+#: dselect/main.cc
 #, c-format
 msgid ""
 "Set your TERM variable correctly, use a better terminal,\n"
@@ -927,11 +952,11 @@ msgstr ""
 "Hãy đặt đúng giá trị biến TERM, dùng một thiết bị cuối tốt hơn,\n"
 "hoặc làm việc với công cụ quản lý theo từng gói %s.\n"
 
-#: dselect/main.cc:340
+#: dselect/main.cc
 msgid "terminal lacks necessary features, giving up"
 msgstr "thiết bị cuối còn thiếu tính năng cần thiết, đầu hàng"
 
-#: dselect/main.cc:425
+#: dselect/main.cc
 msgid ""
 "\n"
 "\n"
@@ -945,7 +970,7 @@ msgstr ""
 "Nhấn phím <Enter> để chọn.   ^L vẽ lại màn hình.\n"
 "\n"
 
-#: dselect/main.cc:430
+#: dselect/main.cc
 msgid ""
 "Copyright (C) 1994-1996 Ian Jackson.\n"
 "Copyright (C) 2000,2001 Wichert Akkerman.\n"
@@ -953,7 +978,7 @@ msgstr ""
 "Bản quyền © nam 1994-1996 Ian Jackson.\n"
 "Bản quyền © năm 2000,2001 Wichert Akkerman.\n"
 
-#: dselect/main.cc:436
+#: dselect/main.cc
 msgid ""
 "\n"
 "\n"
@@ -963,57 +988,57 @@ msgstr ""
 "\n"
 "Truy cập chỉ đọc: chỉ xem trước các lựa chọn sẵn có."
 
-#: dselect/main.cc:455
+#: dselect/main.cc
 msgid "failed to getch in main menu"
 msgstr "gặp lỗi khi đọc từng ký tự khi gõ trong trình đơn chính"
 
-#: dselect/main.cc:538
+#: dselect/main.cc
 #, c-format
 msgid "unknown action string `%.50s'"
 msgstr "chuỗi hành động không rõ “%.250s”"
 
-#: dselect/methlist.cc:66
+#: dselect/methlist.cc
 msgid "Abbrev."
 msgstr "Viết tắt"
 
-#: dselect/methlist.cc:67 dselect/pkgdisplay.cc:188 dselect/pkginfo.cc:110
+#: dselect/methlist.cc dselect/pkgdisplay.cc dselect/pkginfo.cc
 msgid "Description"
 msgstr "Mô tả"
 
-#: dselect/methlist.cc:73
+#: dselect/methlist.cc
 msgid "dselect - list of access methods"
 msgstr "dselect — danh sách các phương thức truy cập"
 
-#: dselect/methlist.cc:82
+#: dselect/methlist.cc
 #, c-format
 msgid "Access method `%s'."
 msgstr "Phương thức truy cập “%s”"
 
-#: dselect/methlist.cc:161 dselect/pkglist.cc:587
+#: dselect/methlist.cc dselect/pkglist.cc
 msgid "doupdate failed"
 msgstr "việc doupdate (chạy tiến trình cập nhật) bị lỗi"
 
-#: dselect/methlist.cc:164 dselect/pkglist.cc:590
+#: dselect/methlist.cc dselect/pkglist.cc
 msgid "failed to unblock SIGWINCH"
 msgstr "việc bỏ ngăn chặn SIGWINCH bị lỗi"
 
-#: dselect/methlist.cc:169 dselect/pkglist.cc:595
+#: dselect/methlist.cc dselect/pkglist.cc
 msgid "failed to re-block SIGWINCH"
 msgstr "việc ngăn chặn lại SIGWINCH bị lỗi"
 
-#: dselect/methlist.cc:170 dselect/pkglist.cc:597
+#: dselect/methlist.cc dselect/pkglist.cc
 msgid "getch failed"
 msgstr "gặp lỗi khi đọc từng ký tự khi gõ"
 
-#: dselect/methlist.cc:187
+#: dselect/methlist.cc
 msgid "Explanation"
 msgstr "Giải thích"
 
-#: dselect/methlist.cc:197
+#: dselect/methlist.cc
 msgid "No explanation available."
 msgstr "Không có giải thích sẵn sàng."
 
-#: dselect/method.cc:67
+#: dselect/method.cc
 #, c-format
 msgid ""
 "\n"
@@ -1024,7 +1049,7 @@ msgstr ""
 "\n"
 "%s: %s\n"
 
-#: dselect/method.cc:70
+#: dselect/method.cc
 msgid ""
 "\n"
 "Press <enter> to continue."
@@ -1032,185 +1057,195 @@ msgstr ""
 "\n"
 "Nhấn phím <Enter> để tiếp tục."
 
-#: dselect/method.cc:82
+#: dselect/method.cc
 msgid "cannot unlock access method area"
 msgstr "không thể khóa vùng phương thức truy cập"
 
-#: dselect/method.cc:96
+#: dselect/method.cc
 msgid "no access methods are available"
 msgstr "không có phương thức truy cập sẵn có nào"
 
-#: dselect/method.cc:115
+#: dselect/method.cc
 msgid "requested operation requires superuser privilege"
 msgstr "thao tác đã yêu cầu cần thiết quyền của siêu người dùng (superuser)"
 
-#: dselect/method.cc:118
+#: dselect/method.cc
 msgid "cannot open or create access method lockfile"
 msgstr "không thể mở hay tạo tập tin khóa phương thức truy cập"
 
-#: dselect/method.cc:125
+#: dselect/method.cc
 msgid "the access method area is already locked"
 msgstr "vùng phương thức truy cập đã được khóa rồi"
 
-#: dselect/method.cc:128
+#: dselect/method.cc
 msgid "cannot lock access method area"
 msgstr "không thể khóa vùng phương thức truy cập"
 
-#: dselect/method.cc:161
+#: dselect/method.cc
 #, c-format
 msgid "Press <enter> to continue.\n"
 msgstr "Nhấn phím <Enter> để tiếp tục.\n"
 
-#: dselect/method.cc:162
+#: dselect/method.cc
 msgid "<standard error>"
 msgstr "<đầu lỗi tiêu chuẩn>"
 
-#: dselect/method.cc:165
+#: dselect/method.cc
 msgid "error reading acknowledgement of program failure message"
 msgstr "gặp lỗi khi đọc sự thừa nhận thông điệp lỗi của chương trình"
 
-#: dselect/method.cc:187
+#: dselect/method.cc
 msgid "no access method is selected or configured"
 msgstr "chưa chọn phương thức truy cập hay nó chưa được cấu hình"
 
-#: dselect/method.cc:196
+#: dselect/method.cc
 msgid "update available list script"
 msgstr "cập nhật tập lệnh danh sách có sẵn"
 
-#: dselect/method.cc:200
+#: dselect/method.cc
 msgid "installation script"
 msgstr "tập lệnh cài đặt"
 
-#: dselect/method.cc:246
+#: dselect/method.cc
 msgid "query/setup script"
 msgstr "tập lệnh truy vấn/thiết lập"
 
-#: dselect/methparse.cc:53
+#: dselect/methparse.cc
 #, c-format
 msgid "syntax error in method options file `%.250s' -- %s"
 msgstr "lỗi cú pháp trong tập tin tùy chọn phương thức “%.250s” -- %s"
 
-#: dselect/methparse.cc:59
+#: dselect/methparse.cc
 #, c-format
 msgid "error reading options file `%.250s'"
 msgstr "gặp lỗi khi đọc tập tin tùy chọn “%.250s”"
 
-#: dselect/methparse.cc:93
+#: dselect/methparse.cc
 #, c-format
 msgid "unable to read `%.250s' directory for reading methods"
 msgstr "không thể đọc thư mục “%.250s” để các phương thức đọc"
 
-#: dselect/methparse.cc:109
+#: dselect/methparse.cc
 #, c-format
 msgid "method `%.250s' has name that is too long (%d > %d characters)"
 msgstr "phương thức “%.250s” có tên quá dài (%d > %d ký tự)"
 
-#: dselect/methparse.cc:120
+#: dselect/methparse.cc
 #, c-format
 msgid "unable to access method script `%.250s'"
 msgstr "không thể truy cập tập lệnh phương thức “%.250s”"
 
-#: dselect/methparse.cc:126
+#: dselect/methparse.cc
 #, c-format
 msgid "unable to read method options file `%.250s'"
 msgstr "không thể đọc tập tin tùy chọn phương thức “%.250s”"
 
-#: dselect/methparse.cc:150
+#: dselect/methparse.cc
 msgid "non-digit where digit wanted"
 msgstr "không phải chữ số ở chỗ cần chữ số"
 
-#: dselect/methparse.cc:153
-msgid "EOF in index string"
+#: dselect/methparse.cc
+#, fuzzy
+#| msgid "EOF in index string"
+msgid "end of file in index string"
 msgstr "gặp kết thúc tập tin trong chuỗi chỉ mục"
 
-#: dselect/methparse.cc:156
+#: dselect/methparse.cc
 msgid "index string too long"
 msgstr "chuỗi chỉ mục quá dài"
 
-#: dselect/methparse.cc:159
+#: dselect/methparse.cc
 msgid "newline before option name start"
 msgstr "dòng mới trước khi bắt đầu tên tùy chọn"
 
-#: dselect/methparse.cc:161
-msgid "EOF before option name start"
-msgstr "gặp kết thúc tập tin trước khi bắt đầu tên tùy chọn"
+#: dselect/methparse.cc
+#, fuzzy
+#| msgid "newline before option name start"
+msgid "end of file before option name start"
+msgstr "dòng mới trước khi bắt đầu tên tùy chọn"
 
-#: dselect/methparse.cc:165
+#: dselect/methparse.cc
 msgid "nonalpha where option name start wanted"
 msgstr "không phải chữ cái ở chỗ cần bắt đầu tên tùy chọn"
 
-#: dselect/methparse.cc:167
+#: dselect/methparse.cc
 msgid "non-alphanum in option name"
 msgstr "không phải chữ cái hay số ở trong tên tùy chọn"
 
-#: dselect/methparse.cc:170
-msgid "EOF in option name"
+#: dselect/methparse.cc
+#, fuzzy
+#| msgid "EOF in option name"
+msgid "end of file in option name"
 msgstr "gặp kết thúc tập tin trong tên tùy chọn"
 
-#: dselect/methparse.cc:175
+#: dselect/methparse.cc
 msgid "newline before summary"
 msgstr "dòng mới trước tổng kết"
 
-#: dselect/methparse.cc:177
-msgid "EOF before summary"
-msgstr "gặp kết thúc tập tin trước tổng kết"
+#: dselect/methparse.cc
+#, fuzzy
+#| msgid "newline before summary"
+msgid "end of file before summary"
+msgstr "dòng mới trước tổng kết"
 
-#: dselect/methparse.cc:183
-msgid "EOF in summary - missing newline"
+#: dselect/methparse.cc
+#, fuzzy
+#| msgid "EOF in summary - missing newline"
+msgid "end of file in summary - missing newline"
 msgstr "gặp kết thúc tập tin trong tổng kết — thiếu dòng mới"
 
-#: dselect/methparse.cc:193
+#: dselect/methparse.cc
 #, c-format
 msgid "unable to open option description file `%.250s'"
 msgstr "không thể mở tập tin mô tả tùy chọn “%.250s”"
 
-#: dselect/methparse.cc:197
+#: dselect/methparse.cc
 #, c-format
 msgid "unable to stat option description file `%.250s'"
 msgstr "không thể lấy các thông tin về tập tin mô tả tùy chọn “%.250s”"
 
-#: dselect/methparse.cc:201
+#: dselect/methparse.cc
 #, c-format
 msgid "failed to read option description file `%.250s'"
 msgstr "không thể đọc tập tin mô tả tùy chọn “%.250s”"
 
-#: dselect/methparse.cc:204
+#: dselect/methparse.cc
 #, c-format
 msgid "error during read of option description file `%.250s'"
 msgstr "gặp lỗi trong khi đọc tập tin mô tả tùy chọn “%.250s”"
 
-#: dselect/methparse.cc:227
+#: dselect/methparse.cc
 #, c-format
 msgid "error during read of method options file `%.250s'"
 msgstr "gặp lỗi trong khi đọc tập tin tùy chọn phương thức “%.250s”"
 
-#: dselect/methparse.cc:250
+#: dselect/methparse.cc
 #, c-format
 msgid "unable to open current option file `%.250s'"
 msgstr "không thể mở tập tin tùy chọn hiện thời “%.250s”"
 
-#: dselect/methparse.cc:286
+#: dselect/methparse.cc
 #, c-format
 msgid "unable to write new option to `%.250s'"
 msgstr "không thể ghi tùy chọn mới tới “%.250s”"
 
-#: dselect/pkgdisplay.cc:36
+#: dselect/pkgdisplay.cc
 msgid "new package"
 msgstr "gói mới"
 
-#: dselect/pkgdisplay.cc:37
+#: dselect/pkgdisplay.cc
 msgid "install"
 msgstr "cài đặt"
 
-#: dselect/pkgdisplay.cc:38
+#: dselect/pkgdisplay.cc
 msgid "hold"
 msgstr "giữ lại"
 
-#: dselect/pkgdisplay.cc:39
+#: dselect/pkgdisplay.cc
 msgid "remove"
 msgstr "gỡ bỏ"
 
-#: dselect/pkgdisplay.cc:40
+#: dselect/pkgdisplay.cc
 msgid "purge"
 msgstr "tẩy"
 
@@ -1218,327 +1253,321 @@ msgstr "tẩy"
 #. * the empty string to store information about the translation. DO NOT
 #. * CHANGE THAT IN A TRANSLATION! The code really relies on that being
 #. * a single space.
-#: dselect/pkgdisplay.cc:47
+#: dselect/pkgdisplay.cc
 msgid " "
 msgstr " "
 
-#: dselect/pkgdisplay.cc:48
+#: dselect/pkgdisplay.cc
 msgid "REINSTALL"
 msgstr "CÀI_LẠI"
 
-#: dselect/pkgdisplay.cc:51
+#: dselect/pkgdisplay.cc
 msgid "not installed"
 msgstr "chưa cài đặt"
 
-#: dselect/pkgdisplay.cc:52
+#: dselect/pkgdisplay.cc
 msgid "removed (configs remain)"
 msgstr "đã gỡ bỏ (giữ lại cấu hình)"
 
-#: dselect/pkgdisplay.cc:53
+#: dselect/pkgdisplay.cc
 msgid "half installed"
 msgstr "đã cài một nửa"
 
-#: dselect/pkgdisplay.cc:54
+#: dselect/pkgdisplay.cc
 msgid "unpacked (not set up)"
 msgstr "đã mở gói (chưa cài đặt)"
 
-#: dselect/pkgdisplay.cc:55
+#: dselect/pkgdisplay.cc
 msgid "half configured (config failed)"
 msgstr "nửa cấu hình (gặp lỗi khi cấu hình)"
 
-#: dselect/pkgdisplay.cc:56
+#: dselect/pkgdisplay.cc
 msgid "awaiting trigger processing"
 msgstr "đang đợi xử lý bẫy"
 
-#: dselect/pkgdisplay.cc:57
+#: dselect/pkgdisplay.cc
 msgid "triggered"
 msgstr "đã sập bẫy"
 
-#: dselect/pkgdisplay.cc:58
+#: dselect/pkgdisplay.cc
 msgid "installed"
 msgstr "đã cài đặt"
 
-#: dselect/pkgdisplay.cc:61
+#: dselect/pkgdisplay.cc
 msgid "Required"
 msgstr "Yêu cầu"
 
-#: dselect/pkgdisplay.cc:62
+#: dselect/pkgdisplay.cc
 msgid "Important"
 msgstr "Quan trọng"
 
-#: dselect/pkgdisplay.cc:63
+#: dselect/pkgdisplay.cc
 msgid "Standard"
 msgstr "Cơ bản"
 
-#: dselect/pkgdisplay.cc:64
+#: dselect/pkgdisplay.cc
 msgid "Optional"
 msgstr "Tùy chọn"
 
-#: dselect/pkgdisplay.cc:65
+#: dselect/pkgdisplay.cc
 msgid "Extra"
 msgstr "Thêm"
 
-#: dselect/pkgdisplay.cc:66
-msgid "!Bug!"
-msgstr "!Lỗi!"
-
-#: dselect/pkgdisplay.cc:67
+#: dselect/pkgdisplay.cc
 msgid "Unclassified"
 msgstr "Chưa phân loại"
 
-#: dselect/pkgdisplay.cc:70
+#: dselect/pkgdisplay.cc
 msgid "suggests"
 msgstr "đề nghị"
 
-#: dselect/pkgdisplay.cc:71
+#: dselect/pkgdisplay.cc
 msgid "recommends"
 msgstr "khuyên"
 
-#: dselect/pkgdisplay.cc:72
+#: dselect/pkgdisplay.cc
 msgid "depends on"
 msgstr "phụ thuộc vào"
 
-#: dselect/pkgdisplay.cc:73
+#: dselect/pkgdisplay.cc
 msgid "pre-depends on"
 msgstr "phụ thuộc trước vào"
 
-#: dselect/pkgdisplay.cc:74
+#: dselect/pkgdisplay.cc
 msgid "breaks"
 msgstr "gãy"
 
-#: dselect/pkgdisplay.cc:75
+#: dselect/pkgdisplay.cc
 msgid "conflicts with"
 msgstr "xung đột với"
 
-#: dselect/pkgdisplay.cc:76
+#: dselect/pkgdisplay.cc
 msgid "provides"
 msgstr "cung cấp"
 
-#: dselect/pkgdisplay.cc:77
+#: dselect/pkgdisplay.cc
 msgid "replaces"
 msgstr "thay thế"
 
-#: dselect/pkgdisplay.cc:78
+#: dselect/pkgdisplay.cc
 msgid "enhances"
 msgstr "tăng cường"
 
-#: dselect/pkgdisplay.cc:81
+#: dselect/pkgdisplay.cc
 msgid "Req"
 msgstr "Cần"
 
-#: dselect/pkgdisplay.cc:82
+#: dselect/pkgdisplay.cc
 msgid "Imp"
 msgstr "Qtg"
 
-#: dselect/pkgdisplay.cc:83
+#: dselect/pkgdisplay.cc
 msgid "Std"
 msgstr "Chn"
 
-#: dselect/pkgdisplay.cc:84
+#: dselect/pkgdisplay.cc
 msgid "Opt"
 msgstr "TCh"
 
-#: dselect/pkgdisplay.cc:85
+#: dselect/pkgdisplay.cc
 msgid "Xtr"
 msgstr "Nữa"
 
-#: dselect/pkgdisplay.cc:86
+#: dselect/pkgdisplay.cc
 msgid "bUG"
 msgstr "lỗi"
 
-#: dselect/pkgdisplay.cc:87
+#: dselect/pkgdisplay.cc
 msgid "?"
 msgstr "?"
 
-#: dselect/pkgdisplay.cc:95 dselect/pkgdisplay.cc:115
+#: dselect/pkgdisplay.cc
 msgid "Broken"
 msgstr "Gẫy"
 
-#: dselect/pkgdisplay.cc:96
+#: dselect/pkgdisplay.cc
 msgid "New"
 msgstr "Mới"
 
-#: dselect/pkgdisplay.cc:97
-msgid "Updated"
-msgstr "Đã cập nhật"
+#: dselect/pkgdisplay.cc
+msgid "Upgradable"
+msgstr ""
 
-#: dselect/pkgdisplay.cc:98
+#: dselect/pkgdisplay.cc
 msgid "Obsolete/local"
 msgstr "Đã cũ/nội bộ"
 
-#: dselect/pkgdisplay.cc:99
-msgid "Up-to-date"
-msgstr "Đã-cập-nhật"
+#: dselect/pkgdisplay.cc
+msgid "Installed"
+msgstr "Đã cài đặt"
 
-#: dselect/pkgdisplay.cc:100
+#: dselect/pkgdisplay.cc
 msgid "Available"
 msgstr "Có sẵn"
 
-#: dselect/pkgdisplay.cc:101 dselect/pkgdisplay.cc:117
+#: dselect/pkgdisplay.cc
 msgid "Removed"
 msgstr "Đã gỡ bỏ"
 
-#: dselect/pkgdisplay.cc:102 dselect/pkgdisplay.cc:111
+#: dselect/pkgdisplay.cc
 msgid "Brokenly installed packages"
 msgstr "Gói đã cài nhưng bị vỡ"
 
-#: dselect/pkgdisplay.cc:103
+#: dselect/pkgdisplay.cc
 msgid "Newly available packages"
 msgstr "Những gói mới sẵn sàng"
 
-#: dselect/pkgdisplay.cc:104
-msgid "Updated packages (newer version is available)"
-msgstr "Những gói cập nhật (có sẵn phiên bản mới hơn)"
+#: dselect/pkgdisplay.cc
+#, fuzzy
+#| msgid "Newly available packages"
+msgid "Upgradable packages"
+msgstr "Những gói mới sẵn sàng"
 
-#: dselect/pkgdisplay.cc:105
-msgid "Obsolete and local packages present on system"
+#: dselect/pkgdisplay.cc
+#, fuzzy
+#| msgid "Obsolete and local packages present on system"
+msgid "Obsolete and locally created packages"
 msgstr "Có những gói đã cũ và gói nội bộ trong hệ thống"
 
-#: dselect/pkgdisplay.cc:106
-msgid "Up to date installed packages"
-msgstr "Những gói đã cài đặt phiên bản mới nhất"
+#: dselect/pkgdisplay.cc
+msgid "Installed packages"
+msgstr "Những gói đã cài đặt"
 
-#: dselect/pkgdisplay.cc:107
-msgid "Available packages (not currently installed)"
-msgstr "Những gói có sẵn (nhưng chưa cài đặt)"
+#: dselect/pkgdisplay.cc
+#, fuzzy
+#| msgid "Up to date installed packages"
+msgid "Available not installed packages"
+msgstr "Những gói đã cài đặt phiên bản mới nhất"
 
-#: dselect/pkgdisplay.cc:108
+#: dselect/pkgdisplay.cc
 msgid "Removed and no longer available packages"
 msgstr "Những gói đã gỡ bỏ và không còn nữa"
 
-#: dselect/pkgdisplay.cc:112
-msgid "Installed packages"
-msgstr "Những gói đã cài đặt"
-
-#: dselect/pkgdisplay.cc:113
+#: dselect/pkgdisplay.cc
 msgid "Removed packages (configuration still present)"
 msgstr "Những gói đã gỡ bỏ (nhưng vẫn còn cấu hình)"
 
-#: dselect/pkgdisplay.cc:114
+#: dselect/pkgdisplay.cc
 msgid "Purged packages and those never installed"
 msgstr "Những gói đã tẩy và gói chưa bao giờ được cài đặt"
 
-#: dselect/pkgdisplay.cc:116
-msgid "Installed"
-msgstr "Đã cài đặt"
-
-#: dselect/pkgdisplay.cc:118
+#: dselect/pkgdisplay.cc
 msgid "Purged"
 msgstr "Đã tẩy"
 
-#: dselect/pkgdisplay.cc:138
+#: dselect/pkgdisplay.cc
 msgid "Error"
 msgstr "Lỗi"
 
-#: dselect/pkgdisplay.cc:139
+#: dselect/pkgdisplay.cc
 msgid "Installed?"
 msgstr "Đã cài?"
 
-#: dselect/pkgdisplay.cc:140
+#: dselect/pkgdisplay.cc
 msgid "Old mark"
 msgstr "Dấu cũ"
 
-#: dselect/pkgdisplay.cc:141
+#: dselect/pkgdisplay.cc
 msgid "Marked for"
 msgstr "Dấu cho"
 
-#: dselect/pkgdisplay.cc:143
+#: dselect/pkgdisplay.cc
 msgid "EIOM"
 msgstr "EIOM"
 
-#: dselect/pkgdisplay.cc:147 dselect/pkgdisplay.cc:150
+#: dselect/pkgdisplay.cc
 msgid "Section"
 msgstr "Phần"
 
-#: dselect/pkgdisplay.cc:148
+#: dselect/pkgdisplay.cc
 msgid "Priority"
 msgstr "Ưu tiên"
 
-#: dselect/pkgdisplay.cc:152
+#: dselect/pkgdisplay.cc
 msgid "Package"
 msgstr "Gói"
 
-#: dselect/pkgdisplay.cc:161 dselect/pkgdisplay.cc:165
+#: dselect/pkgdisplay.cc
 msgid "Avail.arch"
 msgstr "Ktrúc.có"
 
-#: dselect/pkgdisplay.cc:164
+#: dselect/pkgdisplay.cc
 msgid "Inst.arch"
 msgstr "Ktrúc.cài"
 
-#: dselect/pkgdisplay.cc:178 dselect/pkgdisplay.cc:182
+#: dselect/pkgdisplay.cc
 msgid "Avail.ver"
 msgstr "Bản_có"
 
-#: dselect/pkgdisplay.cc:181
+#: dselect/pkgdisplay.cc
 msgid "Inst.ver"
 msgstr "Bản_cài"
 
-#: dselect/pkgdisplay.cc:197
+#: dselect/pkgdisplay.cc
 msgid "dselect - recursive package listing"
 msgstr "dselect — danh sách gói đệ quy"
 
-#: dselect/pkgdisplay.cc:199
+#: dselect/pkgdisplay.cc
 msgid "dselect - inspection of package states"
 msgstr "dselect — kiểm tra trạng thái các gói"
 
-#: dselect/pkgdisplay.cc:200
+#: dselect/pkgdisplay.cc
 msgid "dselect - main package listing"
 msgstr "dselect — danh sách gói chính"
 
-#: dselect/pkgdisplay.cc:208
+#: dselect/pkgdisplay.cc
 msgid " (by section)"
 msgstr " (theo phần)"
 
-#: dselect/pkgdisplay.cc:211
+#: dselect/pkgdisplay.cc
 msgid " (avail., section)"
 msgstr " (sẵn, phần)"
 
-#: dselect/pkgdisplay.cc:214
+#: dselect/pkgdisplay.cc
 msgid " (status, section)"
 msgstr " (trạng thái, phần)"
 
-#: dselect/pkgdisplay.cc:223
+#: dselect/pkgdisplay.cc
 msgid " (by priority)"
 msgstr " (theo ưu tiên)"
 
-#: dselect/pkgdisplay.cc:226
+#: dselect/pkgdisplay.cc
 msgid " (avail., priority)"
 msgstr " (sẵn, ưu tiên)"
 
-#: dselect/pkgdisplay.cc:229
+#: dselect/pkgdisplay.cc
 msgid " (status, priority)"
 msgstr " (trạng thái, ưu tiên)"
 
-#: dselect/pkgdisplay.cc:238
+#: dselect/pkgdisplay.cc
 msgid " (alphabetically)"
 msgstr " (theo bảng chữ cái)"
 
-#: dselect/pkgdisplay.cc:241
+#: dselect/pkgdisplay.cc
 msgid " (by availability)"
 msgstr " (theo khả năng sẵn)"
 
-#: dselect/pkgdisplay.cc:244
+#: dselect/pkgdisplay.cc
 msgid " (by status)"
 msgstr " (theo trạng thái)"
 
-#: dselect/pkgdisplay.cc:259
+#: dselect/pkgdisplay.cc
 msgid " mark:+/=/- terse:v help:?"
 msgstr " dấu:+/=/- ngắn gọn:v trợ giúp:?"
 
-#: dselect/pkgdisplay.cc:260
+#: dselect/pkgdisplay.cc
 msgid " mark:+/=/- verbose:v help:?"
 msgstr " dấu:+/=/- chi tiết:v trợ giúp:?"
 
-#: dselect/pkgdisplay.cc:262
+#: dselect/pkgdisplay.cc
 msgid " terse:v help:?"
 msgstr " ngắn gọn:v trợ giúp:?"
 
-#: dselect/pkgdisplay.cc:263
+#: dselect/pkgdisplay.cc
 msgid " verbose:v help:?"
 msgstr " chi tiết:v trợ giúp:?"
 
-#: dselect/pkginfo.cc:85
+#: dselect/pkginfo.cc
 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 "
@@ -1557,80 +1586,110 @@ msgstr ""
 "Có thể dùng “o” và “O” để thay đổi thứ tự sắp xếp và tạo điều kiện cho việc "
 "đánh dấu các gói trong các dạng nhóm khác nhau."
 
-#: dselect/pkginfo.cc:98
+#: dselect/pkginfo.cc
 msgid "Interrelationships"
 msgstr "Quan hệ qua lại"
 
-#: dselect/pkginfo.cc:117
+#: dselect/pkginfo.cc
 msgid "No description available."
 msgstr "Không có mô tả gì cả."
 
-#: dselect/pkginfo.cc:135
+#: dselect/pkginfo.cc
 msgid "Installed control file information"
 msgstr "Thông tin tập tin điều khiển đã cài đặt "
 
-#: dselect/pkginfo.cc:151
+#: dselect/pkginfo.cc
 msgid "Available control file information"
 msgstr "Thông tin tập tin điều khiển sẵn có"
 
-#: dselect/pkglist.cc:425
+#: dselect/pkglist.cc
 msgid "there are no packages"
 msgstr "ở đây không có gói nào"
 
-#: dselect/pkglist.cc:521
+#: dselect/pkglist.cc
 msgid "invalid search option given"
 msgstr "đưa ra tuỳ chọn tìm kiếm không hợp lệ"
 
-#: dselect/pkglist.cc:536
+#: dselect/pkglist.cc
 msgid "error in regular expression"
 msgstr "gặp lỗi trong biểu thức chính quy"
 
-#: dselect/pkgsublist.cc:111
+#: dselect/pkgsublist.cc
 msgid " does not appear to be available\n"
 msgstr " có vẻ không có sẵn\n"
 
-#: dselect/pkgsublist.cc:131
+#: dselect/pkgsublist.cc
 msgid " or "
 msgstr " hoặc "
 
-#: dselect/pkgtop.cc:58
+#: dselect/pkgtop.cc
 msgid "All"
 msgstr "Mọi"
 
-#: dselect/pkgtop.cc:80
+#: dselect/pkgtop.cc
 msgid "All packages"
 msgstr "Mọi gói"
 
-#: dselect/pkgtop.cc:84
+#: dselect/pkgtop.cc
 #, c-format
 msgid "%s packages without a section"
 msgstr "%s gói không nằm trong phần"
 
-#: dselect/pkgtop.cc:86
+#: dselect/pkgtop.cc
 #, c-format
 msgid "%s packages in section %s"
 msgstr "%s gói trong phần %s"
 
-#: dselect/pkgtop.cc:92
+#: dselect/pkgtop.cc
 #, c-format
 msgid "%s %s packages"
 msgstr "%s %s gói"
 
-#: dselect/pkgtop.cc:96
+#: dselect/pkgtop.cc
 #, c-format
 msgid "%s %s packages without a section"
 msgstr "%s %s gói không nằm trong phần"
 
-#: dselect/pkgtop.cc:98
+#: dselect/pkgtop.cc
 #, c-format
 msgid "%s %s packages in section %s"
 msgstr "%s %s gói trong phần %s"
 
-#: dselect/pkgtop.cc:119
+#: dselect/pkgtop.cc
 #, c-format
 msgid "%-*s %s%s%s;  %s (was: %s).  %s"
 msgstr "%-*s %s%s%s;  %s (đã là: %s).  %s"
 
+#~ msgid "Actions:\n"
+#~ msgstr "Thao tác:\n"
+
+#~ msgid "Colours:\n"
+#~ msgstr "Màu sắc:\n"
+
+#~ msgid "Attributes:\n"
+#~ msgstr "Thuộc tính:\n"
+
+#~ msgid "EOF before option name start"
+#~ msgstr "gặp kết thúc tập tin trước khi bắt đầu tên tùy chọn"
+
+#~ msgid "EOF before summary"
+#~ msgstr "gặp kết thúc tập tin trước tổng kết"
+
+#~ msgid "!Bug!"
+#~ msgstr "!Lỗi!"
+
+#~ msgid "Updated"
+#~ msgstr "Đã cập nhật"
+
+#~ msgid "Up-to-date"
+#~ msgstr "Đã-cập-nhật"
+
+#~ msgid "Updated packages (newer version is available)"
+#~ msgstr "Những gói cập nhật (có sẵn phiên bản mới hơn)"
+
+#~ msgid "Available packages (not currently installed)"
+#~ msgstr "Những gói có sẵn (nhưng chưa cài đặt)"
+
 #~ msgid ""
 #~ "Actions:\n"
 #~ "  access update select install config remove quit\n"
diff --git a/dselect/po/zh_CN.po b/dselect/po/zh_CN.po
index 90bc67f81..fe1a71745 100644
--- a/dselect/po/zh_CN.po
+++ b/dselect/po/zh_CN.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dselect 1.13\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2014-12-23 18:12+0100\n"
+"POT-Creation-Date: 2015-04-06 09:37+0200\n"
 "PO-Revision-Date: 2006-05-06 20:11+0800\n"
 "Last-Translator: Kov Chai <tchaikov@sjtu.edu.cn>\n"
 "Language-Team: Chinese (simplified) <debian-l10n-chinese@lists.debian.org>\n"
@@ -20,28 +20,28 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: dselect/basecmds.cc:125
+#: dselect/basecmds.cc
 msgid "Search for ? "
 msgstr "想搜索什么？"
 
-#: dselect/basecmds.cc:149
+#: dselect/basecmds.cc
 msgid "Error: "
 msgstr "错误："
 
-#: dselect/basecmds.cc:180
+#: dselect/basecmds.cc
 msgid "Help: "
 msgstr "帮助："
 
-#: dselect/basecmds.cc:186
+#: dselect/basecmds.cc
 msgid "Press ? for help menu, . for next topic, <space> to exit help."
 msgstr ""
 "摁 ? 可以弹出帮助菜单，用 . 来进入下个主题，通过 <空格> 就能退出帮助界面。"
 
-#: dselect/basecmds.cc:193
+#: dselect/basecmds.cc
 msgid "Help information is available under the following topics:"
 msgstr "您可获得有关下列主题的帮助信息："
 
-#: dselect/basecmds.cc:201
+#: dselect/basecmds.cc
 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. "
@@ -49,243 +49,243 @@ msgstr ""
 "请摁上面列表中所示的按键，用 <空格> 或者“q”来退出帮助界面，\n"
 "或者用“.”(英文句点)来依次阅读帮助页面。"
 
-#: dselect/basecmds.cc:207
+#: dselect/basecmds.cc
 msgid "error reading keyboard in help"
 msgstr "在帮助界面读取键盘输入时出错"
 
-#: dselect/baselist.cc:60
+#: dselect/baselist.cc
 msgid "ioctl(TIOCGWINSZ) failed"
 msgstr "ioctl(TIOCGWINSZ) 失败"
 
-#: dselect/baselist.cc:63
+#: dselect/baselist.cc
 msgid "doupdate in SIGWINCH handler failed"
 msgstr "在 SIGWINCH 的处理函数里 doupdate 失败了"
 
-#: dselect/baselist.cc:72
+#: dselect/baselist.cc
 msgid "failed to restore old SIGWINCH sigact"
 msgstr "恢复原先的 SIGWINCH sigact 失败"
 
-#: dselect/baselist.cc:75
+#: dselect/baselist.cc
 msgid "failed to restore old signal mask"
 msgstr "恢复原先的 signal mask 失败"
 
-#: dselect/baselist.cc:86
+#: dselect/baselist.cc
 msgid "failed to get old signal mask"
 msgstr "获取原先的 signal mask 失败"
 
-#: dselect/baselist.cc:88
+#: dselect/baselist.cc
 msgid "failed to get old SIGWINCH sigact"
 msgstr "获取原先的 SIGWINCH sigact 出错"
 
-#: dselect/baselist.cc:93
+#: dselect/baselist.cc
 msgid "failed to block SIGWINCH"
 msgstr "无法阻塞 SIGWINCH 信号"
 
-#: dselect/baselist.cc:99
+#: dselect/baselist.cc
 msgid "failed to set new SIGWINCH sigact"
 msgstr "设置新的 SIGWINCH sigact 失败"
 
-#: dselect/baselist.cc:174
+#: dselect/baselist.cc
 msgid "failed to allocate colour pair"
 msgstr "分配颜色对失败"
 
-#: dselect/baselist.cc:203
+#: dselect/baselist.cc
 msgid "failed to create title window"
 msgstr "创建标题窗口失败"
 
-#: dselect/baselist.cc:207
+#: dselect/baselist.cc
 msgid "failed to create whatinfo window"
 msgstr "创建 whatinfo 窗口失败"
 
-#: dselect/baselist.cc:211
+#: dselect/baselist.cc
 msgid "failed to create baselist pad"
 msgstr "无法新建基列表的小窗口"
 
-#: dselect/baselist.cc:214
+#: dselect/baselist.cc
 msgid "failed to create heading pad"
 msgstr "无法新建标题小窗口"
 
-#: dselect/baselist.cc:218
+#: dselect/baselist.cc
 msgid "failed to create thisstate pad"
 msgstr "无法新建 thisstate 小窗口"
 
-#: dselect/baselist.cc:222
+#: dselect/baselist.cc
 msgid "failed to create info pad"
 msgstr "无法新建相关信息小窗口"
 
-#: dselect/baselist.cc:227
+#: dselect/baselist.cc
 msgid "failed to create query window"
 msgstr "创建查询窗口失败"
 
-#: dselect/baselist.cc:298
+#: dselect/baselist.cc
 #, fuzzy
 msgid "Keybindings"
 msgstr "键位绑定"
 
-#: dselect/baselist.cc:347
+#: dselect/baselist.cc
 #, c-format
 msgid "  -- %d%%, press "
 msgstr "  -- %d%%，请摁 "
 
-#: dselect/baselist.cc:350
+#: dselect/baselist.cc
 #, c-format
 msgid "%s for more"
 msgstr "%s 继续往下读"
 
-#: dselect/baselist.cc:354
+#: dselect/baselist.cc
 #, c-format
 msgid "%s to go back"
 msgstr "%s 可以跳回原来的位置"
 
-#: dselect/bindings.cc:78
+#: dselect/bindings.cc
 msgid "[not bound]"
 msgstr "[未绑定]"
 
-#: dselect/bindings.cc:82
+#: dselect/bindings.cc
 #, c-format
 msgid "[unk: %d]"
 msgstr "[未知：%d]"
 
-#: dselect/bindings.cc:141
+#: dselect/bindings.cc
 msgid "Scroll onwards through help/information"
 msgstr "在帮助文档或相关信息中向前滚动"
 
-#: dselect/bindings.cc:142
+#: dselect/bindings.cc
 msgid "Scroll backwards through help/information"
 msgstr "在帮助或相关信息中向前滚动"
 
-#: dselect/bindings.cc:143
+#: dselect/bindings.cc
 msgid "Move up"
 msgstr "上移"
 
-#: dselect/bindings.cc:144
+#: dselect/bindings.cc
 msgid "Move down"
 msgstr "下移"
 
-#: dselect/bindings.cc:145
+#: dselect/bindings.cc
 msgid "Go to top of list"
 msgstr "跳到顶端列表"
 
-#: dselect/bindings.cc:146
+#: dselect/bindings.cc
 msgid "Go to end of list"
 msgstr "跳到底端列表"
 
-#: dselect/bindings.cc:147
+#: dselect/bindings.cc
 msgid "Request help (cycle through help screens)"
 msgstr "请求帮助(在帮助界面周游)"
 
-#: dselect/bindings.cc:148
+#: dselect/bindings.cc
 msgid "Cycle through information displays"
 msgstr "在相关信息界面里周游"
 
-#: dselect/bindings.cc:149
+#: dselect/bindings.cc
 msgid "Redraw display"
 msgstr "重画屏幕"
 
-#: dselect/bindings.cc:150
+#: dselect/bindings.cc
 msgid "Scroll onwards through list by 1 line"
 msgstr "在列表中向前滚动一行"
 
-#: dselect/bindings.cc:151
+#: dselect/bindings.cc
 msgid "Scroll backwards through list by 1 line"
 msgstr "在列表中向后滚动一行"
 
-#: dselect/bindings.cc:152
+#: dselect/bindings.cc
 msgid "Scroll onwards through help/information by 1 line"
 msgstr "在帮助或相关信息中向前滚动一行"
 
-#: dselect/bindings.cc:153
+#: dselect/bindings.cc
 msgid "Scroll backwards through help/information by 1 line"
 msgstr "在帮助或相关信息中向后滚动一行"
 
-#: dselect/bindings.cc:154
+#: dselect/bindings.cc
 msgid "Scroll onwards through list"
 msgstr "在列表中向前滚动"
 
-#: dselect/bindings.cc:155
+#: dselect/bindings.cc
 msgid "Scroll backwards through list"
 msgstr "在列表中向前滚动"
 
-#: dselect/bindings.cc:158
+#: dselect/bindings.cc
 msgid "Mark package(s) for installation"
 msgstr "把软件包标记为“将要安装”"
 
-#: dselect/bindings.cc:159
+#: dselect/bindings.cc
 msgid "Mark package(s) for deinstallation"
 msgstr "把软件包标记为“将要卸载”"
 
-#: dselect/bindings.cc:160
+#: dselect/bindings.cc
 msgid "Mark package(s) for deinstall and purge"
 msgstr "把软件包标记为“卸载并清除”"
 
-#: dselect/bindings.cc:161
+#: dselect/bindings.cc
 msgid "Make highlight more specific"
 msgstr "让高亮显示更有针对性"
 
-#: dselect/bindings.cc:162
+#: dselect/bindings.cc
 msgid "Make highlight less specific"
 msgstr "让高亮显示更没有针对性"
 
-#: dselect/bindings.cc:163
+#: dselect/bindings.cc
 msgid "Search for a package whose name contains a string"
 msgstr "搜索软件包名字含有特定字符串的软件包"
 
-#: dselect/bindings.cc:164
+#: dselect/bindings.cc
 #, fuzzy
 #| msgid "Repeat last search."
 msgid "Repeat last search"
 msgstr "重复上次的搜索。"
 
-#: dselect/bindings.cc:165
+#: dselect/bindings.cc
 msgid "Swap sort order priority/section"
 msgstr "调整排序的依据 - 优先级/所属大类"
 
-#: dselect/bindings.cc:166
+#: dselect/bindings.cc
 msgid "Quit, confirming, and checking dependencies"
 msgstr "退出，并确认操作而且对依赖问题进行复查"
 
-#: dselect/bindings.cc:167
+#: dselect/bindings.cc
 msgid "Quit, confirming without check"
 msgstr "退出，并确认操作而且不再检查"
 
-#: dselect/bindings.cc:168
+#: dselect/bindings.cc
 msgid "Quit, rejecting conflict/dependency suggestions"
 msgstr "退出，并拒绝有关冲突和依赖问题的建议"
 
-#: dselect/bindings.cc:169
+#: dselect/bindings.cc
 msgid "Abort - quit without making changes"
 msgstr "中止操作 - 不作任何更改并退出"
 
-#: dselect/bindings.cc:170
+#: dselect/bindings.cc
 msgid "Revert to old state for all packages"
 msgstr "把所有软件包的状态恢复到修改前"
 
-#: dselect/bindings.cc:171
+#: dselect/bindings.cc
 msgid "Revert to suggested state for all packages"
 msgstr "把所有软件包的状态恢复到建议值"
 
-#: dselect/bindings.cc:172
+#: dselect/bindings.cc
 msgid "Revert to directly requested state for all packages"
 msgstr "把所有软件包的状态恢复到所要求的值"
 
-#: dselect/bindings.cc:173
+#: dselect/bindings.cc
 #, fuzzy
 msgid "Revert to currently installed state for all packages"
 msgstr "把所有软件包的状态恢复到所要求的值"
 
-#: dselect/bindings.cc:176
+#: dselect/bindings.cc
 msgid "Select currently-highlighted access method"
 msgstr "选中当前高亮显示的安装手段"
 
-#: dselect/bindings.cc:177
+#: dselect/bindings.cc
 msgid "Quit without changing selected access method"
 msgstr "退出程序，而且不修改所选的安装手段"
 
-#: dselect/helpmsgs.cc:29
+#: dselect/helpmsgs.cc
 msgid "Keystrokes"
 msgstr "按键操作"
 
-#: dselect/helpmsgs.cc:29
+#: dselect/helpmsgs.cc
 #, fuzzy
 msgid ""
 "Motion keys: Next/Previous, Top/End, Up/Down, Backwards/Forwards:\n"
@@ -344,11 +344,11 @@ msgstr ""
 "索)\n"
 "   D     把所有软件包的状态改成到所要求的值   \\        重复上次的搜索\n"
 
-#: dselect/helpmsgs.cc:55
+#: dselect/helpmsgs.cc
 msgid "Introduction to package selections"
 msgstr "软件包自选界面简介"
 
-#: dselect/helpmsgs.cc:55
+#: dselect/helpmsgs.cc
 msgid ""
 "Welcome to dselect's main package listing.\n"
 "\n"
@@ -404,11 +404,11 @@ msgstr ""
 "\n"
 "现在您可以通过摁 <空格> 键离开本帮助，进入列表界面了。\n"
 
-#: dselect/helpmsgs.cc:80
+#: dselect/helpmsgs.cc
 msgid "Introduction to read-only package list browser"
 msgstr "只读软件包列表浏览界面简介"
 
-#: dselect/helpmsgs.cc:80
+#: dselect/helpmsgs.cc
 msgid ""
 "Welcome to dselect's main package listing.\n"
 "\n"
@@ -444,11 +444,11 @@ msgstr ""
 "\n"
 "现在您可以通过摁 <空格> 键离开帮助系统并进入列表界面了。\n"
 
-#: dselect/helpmsgs.cc:99
+#: dselect/helpmsgs.cc
 msgid "Introduction to conflict/dependency resolution sub-list"
 msgstr "用于解决冲突/依赖问题的子列表的简介"
 
-#: dselect/helpmsgs.cc:99
+#: dselect/helpmsgs.cc
 msgid ""
 "Dependency/conflict resolution - introduction.\n"
 "\n"
@@ -510,11 +510,11 @@ msgstr ""
 "请摁 <空格> 离开帮助系统并进入子列表。\n"
 "请记住：需要帮助时，摁“?”键。\n"
 
-#: dselect/helpmsgs.cc:125
+#: dselect/helpmsgs.cc
 msgid "Display, part 1: package listing and status chars"
 msgstr "显示部位 1：软件包列表及状态简写"
 
-#: dselect/helpmsgs.cc:125
+#: dselect/helpmsgs.cc
 #, fuzzy
 msgid ""
 "The top half of the screen shows a list of packages.  For each package you "
@@ -572,11 +572,11 @@ msgstr ""
 "的版本号和当前可用的版本号（使用 shift-v 可以开启或关闭其\n"
 "显示)，以及简要的介绍。\n"
 
-#: dselect/helpmsgs.cc:152
+#: dselect/helpmsgs.cc
 msgid "Display, part 2: list highlight; information display"
 msgstr "显示部位 2：列表高亮部分；相关信息的显示"
 
-#: dselect/helpmsgs.cc:152
+#: dselect/helpmsgs.cc
 msgid ""
 "* Highlight: One line in the package list will be highlighted.  It "
 "indicates\n"
@@ -620,11 +620,11 @@ msgstr ""
 "  您可以用“i”键在这些显示内容中来回切换，用“I”来关闭相关信息\n"
 "  的显示，或者扩大它在屏幕中所占的幅面直到几乎完全占据屏幕。\n"
 
-#: dselect/helpmsgs.cc:176
+#: dselect/helpmsgs.cc
 msgid "Introduction to method selection display"
 msgstr "安装手段选择界面的简介"
 
-#: dselect/helpmsgs.cc:176
+#: dselect/helpmsgs.cc
 msgid ""
 "dselect and dpkg can do automatic installation, loading the package files to "
 "be\n"
@@ -661,11 +661,11 @@ msgstr ""
 "现在摁“k”键就能见到按键操作的完整列表，也可以在帮助菜单中摁“k”键。\n"
 "摁“?”就能呼出帮助菜单。\n"
 
-#: dselect/helpmsgs.cc:196
+#: dselect/helpmsgs.cc
 msgid "Keystrokes for method selection"
 msgstr "选择安装手段的按键操作"
 
-#: dselect/helpmsgs.cc:196
+#: dselect/helpmsgs.cc
 #, fuzzy
 msgid ""
 "Motion keys: Next/Previous, Top/End, Up/Down, Backwards/Forwards:\n"
@@ -713,104 +713,104 @@ msgstr ""
 "  /                进行搜索(摁回车取消搜索)\n"
 "  \\               重复上次的搜索\n"
 
-#: dselect/main.cc:63
+#: dselect/main.cc
 msgid "Type dselect --help for help."
 msgstr "输入 dselect --help 就可以阅读帮助信息。"
 
-#: dselect/main.cc:145
+#: dselect/main.cc
 msgid "a"
 msgstr "a"
 
-#: dselect/main.cc:145
+#: dselect/main.cc
 msgid "[A]ccess"
 msgstr "来源[A]"
 
-#: dselect/main.cc:145
+#: dselect/main.cc
 msgid "Choose the access method to use."
 msgstr "选择所使用的安装来源。"
 
-#: dselect/main.cc:146
+#: dselect/main.cc
 msgid "u"
 msgstr "u"
 
-#: dselect/main.cc:146
+#: dselect/main.cc
 msgid "[U]pdate"
 msgstr "更新[U]"
 
-#: dselect/main.cc:146
+#: dselect/main.cc
 msgid "Update list of available packages, if possible."
 msgstr "如果可能的话，更新可用的软件包列表。"
 
-#: dselect/main.cc:147
+#: dselect/main.cc
 msgid "s"
 msgstr "s"
 
-#: dselect/main.cc:147
+#: dselect/main.cc
 msgid "[S]elect"
 msgstr "选择[S]"
 
-#: dselect/main.cc:147
+#: dselect/main.cc
 msgid "Request which packages you want on your system."
 msgstr "对系统中安装的软件包进行取舍。"
 
-#: dselect/main.cc:148
+#: dselect/main.cc
 msgid "i"
 msgstr "i"
 
-#: dselect/main.cc:148
+#: dselect/main.cc
 msgid "[I]nstall"
 msgstr "安装[I]"
 
-#: dselect/main.cc:148
+#: dselect/main.cc
 msgid "Install and upgrade wanted packages."
 msgstr "安装并升级之前指定的软件包。"
 
-#: dselect/main.cc:149
+#: dselect/main.cc
 msgid "c"
 msgstr "c"
 
-#: dselect/main.cc:149
+#: dselect/main.cc
 msgid "[C]onfig"
 msgstr "配置[C]"
 
-#: dselect/main.cc:149
+#: dselect/main.cc
 msgid "Configure any packages that are unconfigured."
 msgstr "对所有还未配置的软件包进行配置"
 
-#: dselect/main.cc:150
+#: dselect/main.cc
 msgid "r"
 msgstr "r"
 
-#: dselect/main.cc:150
+#: dselect/main.cc
 msgid "[R]emove"
 msgstr "删除[R]"
 
-#: dselect/main.cc:150
+#: dselect/main.cc
 msgid "Remove unwanted software."
 msgstr "删除不需要的软件包"
 
-#: dselect/main.cc:151
+#: dselect/main.cc
 msgid "q"
 msgstr "q"
 
-#: dselect/main.cc:151
+#: dselect/main.cc
 msgid "[Q]uit"
 msgstr "退出[Q]"
 
-#: dselect/main.cc:151
+#: dselect/main.cc
 msgid "Quit dselect."
 msgstr "退出 dselect 程序"
 
-#: dselect/main.cc:152
+#: dselect/main.cc
 msgid "menu"
 msgstr "菜单"
 
-#: dselect/main.cc:157
+#: dselect/main.cc
 #, c-format
 msgid "Debian `%s' package handling frontend version %s.\n"
 msgstr "Debian “%s” 软件包操作前端 %s 版。\n"
 
-#: dselect/main.cc:160
+#: dselect/main.cc
 #, fuzzy
 msgid ""
 "This is free software; see the GNU General Public License version 2 or\n"
@@ -820,20 +820,28 @@ msgstr ""
 "第二版或其更新的版本。该软件【不】提供任何担保。\n"
 "请通过执行 %s --licence 来查看版权和许可证的细节。\n"
 
-#: dselect/main.cc:169 dselect/main.cc:217
+#: dselect/main.cc
 msgid "<standard output>"
 msgstr ""
 
-#: dselect/main.cc:180
-#, c-format
+#: dselect/main.cc
+#, fuzzy, c-format
+#| msgid ""
+#| "Usage: %s [<option> ...] [<action> ...]\n"
+#| "\n"
 msgid ""
-"Usage: %s [<option> ...] [<action> ...]\n"
+"Usage: %s [<option>...] [<command>...]\n"
 "\n"
 msgstr ""
 "用法：%s [<选项> ...] [<操作> ...]\n"
 "\n"
 
-#: dselect/main.cc:184
+#: dselect/main.cc
+#, c-format
+msgid "Commands:\n"
+msgstr ""
+
+#: dselect/main.cc
 #, fuzzy, c-format
 #| msgid ""
 #| "Options:\n"
@@ -847,12 +855,12 @@ msgstr ""
 #| "\n"
 msgid ""
 "Options:\n"
-"  --admindir <directory>     Use <directory> instead of %s.\n"
-"  --expert                   Turn on expert mode.\n"
-"  --debug <file> | -D<file>  Turn on debugging, sending output to <file>.\n"
-"  --colour | --color screenpart:[foreground],[background][:attr[+attr+...]]\n"
-"                             Configure screen colours.\n"
-"\n"
+"      --admindir <directory>       Use <directory> instead of %s.\n"
+"      --expert                     Turn on expert mode.\n"
+"  -D, --debug <file>               Turn on debugging, send output to "
+"<file>.\n"
+"      --color <color-spec>         Configure screen colors.\n"
+"      --colour <color-spec>        Ditto.\n"
 msgstr ""
 "选项：\n"
 "  --admindir <目录>          使用 <目录> 而非 %s。\n"
@@ -862,11 +870,11 @@ msgstr ""
 "                             设置显示所用的配色。\n"
 "\n"
 
-#: dselect/main.cc:193
+#: dselect/main.cc
 #, fuzzy, c-format
 msgid ""
-"  --help                     Show this help message.\n"
-"  --version                  Show the version.\n"
+"  -?, --help                       Show this help message.\n"
+"      --version                    Show the version.\n"
 "\n"
 msgstr ""
 "  --help                     显示本帮助信息。\n"
@@ -874,65 +882,67 @@ msgstr ""
 "  --license | --license      显示许可证。\n"
 "\n"
 
-#: dselect/main.cc:197
-#, fuzzy, c-format
-#| msgid "Section"
-msgid "Actions:\n"
-msgstr "所属大类"
-
-#: dselect/main.cc:202
+#: dselect/main.cc
 #, c-format
-msgid "Screenparts:\n"
+msgid ""
+"<color-spec> is <screen-part>:[<foreground>],[<background>][:"
+"<attr>[+<attr>]...]\n"
+msgstr ""
+
+#: dselect/main.cc
+#, fuzzy, c-format
+#| msgid "Screenparts:\n"
+msgid "<screen-part> is:"
 msgstr "显示部位：\n"
 
-#: dselect/main.cc:207
+#: dselect/main.cc
 #, c-format
-msgid "Colours:\n"
-msgstr "颜色：\n"
+msgid "<color> is:"
+msgstr ""
 
-#: dselect/main.cc:212
+#: dselect/main.cc
 #, c-format
-msgid "Attributes:\n"
-msgstr "属性：\n"
+msgid "<attr> is:"
+msgstr ""
 
-#: dselect/main.cc:232
+#: dselect/main.cc
 #, c-format
 msgid "couldn't open debug file `%.255s'\n"
 msgstr "无法打开调试信息文件“%.255s”\n"
 
-#: dselect/main.cc:253
+#: dselect/main.cc
 #, fuzzy, c-format
 #| msgid "Invalid %s `%s'\n"
 msgid "invalid %s '%s'"
 msgstr "无效的 %s “%s”\n"
 
-#: dselect/main.cc:272
+#: dselect/main.cc
 msgid "screen part"
 msgstr "显示部分"
 
-#: dselect/main.cc:278
+#: dselect/main.cc
 #, fuzzy
 #| msgid "Null colour specification\n"
 msgid "null colour specification"
 msgstr "未指定颜色\n"
 
-#: dselect/main.cc:286 dselect/main.cc:291
+#: dselect/main.cc
 msgid "colour"
 msgstr "颜色"
 
-#: dselect/main.cc:299
+#: dselect/main.cc
 msgid "colour attribute"
 msgstr "颜色属性"
 
-#: dselect/main.cc:333
+#: dselect/main.cc
 msgid "Terminal does not appear to support cursor addressing.\n"
 msgstr "终端不支持游标的定位。\n"
 
-#: dselect/main.cc:335
+#: dselect/main.cc
 msgid "Terminal does not appear to support highlighting.\n"
 msgstr "终端不支持高亮显示。\n"
 
-#: dselect/main.cc:337
+#: dselect/main.cc
 #, c-format
 msgid ""
 "Set your TERM variable correctly, use a better terminal,\n"
@@ -941,11 +951,11 @@ msgstr ""
 "请正确设置您的 TERM 变量，用一个更合适的终端类型，\n"
 "或者转用针对单个软件包的包管理工具，即 %s。\n"
 
-#: dselect/main.cc:340
+#: dselect/main.cc
 msgid "terminal lacks necessary features, giving up"
 msgstr "由于终端缺乏必要的特性，只得中止操作"
 
-#: dselect/main.cc:425
+#: dselect/main.cc
 msgid ""
 "\n"
 "\n"
@@ -959,7 +969,7 @@ msgstr ""
 "摁 <回车> 来确认。  用 ^L 来刷屏。\n"
 "\n"
 
-#: dselect/main.cc:430
+#: dselect/main.cc
 msgid ""
 "Copyright (C) 1994-1996 Ian Jackson.\n"
 "Copyright (C) 2000,2001 Wichert Akkerman.\n"
@@ -967,7 +977,7 @@ msgstr ""
 "版权所有 (C) 1994-1996 Ian Jackson。\n"
 "版权所有 (C) 2000,2001 Wichert Akkerman。\n"
 
-#: dselect/main.cc:436
+#: dselect/main.cc
 msgid ""
 "\n"
 "\n"
@@ -977,58 +987,58 @@ msgstr ""
 "\n"
 "只读访问：仅仅可以查看被选中的项目！"
 
-#: dselect/main.cc:455
+#: dselect/main.cc
 msgid "failed to getch in main menu"
 msgstr "在主菜单界面中 getch 失败"
 
-#: dselect/main.cc:538
+#: dselect/main.cc
 #, c-format
 msgid "unknown action string `%.50s'"
 msgstr "不能识别的操作字串“%.50s”"
 
-#: dselect/methlist.cc:66
+#: dselect/methlist.cc
 msgid "Abbrev."
 msgstr "缩写"
 
-#: dselect/methlist.cc:67 dselect/pkgdisplay.cc:188 dselect/pkginfo.cc:110
+#: dselect/methlist.cc dselect/pkgdisplay.cc dselect/pkginfo.cc
 msgid "Description"
 msgstr "简介"
 
-#: dselect/methlist.cc:73
+#: dselect/methlist.cc
 msgid "dselect - list of access methods"
 msgstr "dselect - 安装手段的列表"
 
-#: dselect/methlist.cc:82
+#: dselect/methlist.cc
 #, c-format
 msgid "Access method `%s'."
 msgstr "安装手段“%s”。"
 
-#: dselect/methlist.cc:161 dselect/pkglist.cc:587
+#: dselect/methlist.cc dselect/pkglist.cc
 msgid "doupdate failed"
 msgstr "doupdate 失败"
 
-#: dselect/methlist.cc:164 dselect/pkglist.cc:590
+#: dselect/methlist.cc dselect/pkglist.cc
 msgid "failed to unblock SIGWINCH"
 msgstr "无法取消阻塞 SIGWINCH 信号"
 
-#: dselect/methlist.cc:169 dselect/pkglist.cc:595
+#: dselect/methlist.cc dselect/pkglist.cc
 msgid "failed to re-block SIGWINCH"
 msgstr "重新阻塞 SIGWINCH 信号失败"
 
-#: dselect/methlist.cc:170 dselect/pkglist.cc:597
+#: dselect/methlist.cc dselect/pkglist.cc
 msgid "getch failed"
 msgstr "getch 失败"
 
-#: dselect/methlist.cc:187
+#: dselect/methlist.cc
 #, fuzzy
 msgid "Explanation"
 msgstr "后面安装手段的说明"
 
-#: dselect/methlist.cc:197
+#: dselect/methlist.cc
 msgid "No explanation available."
 msgstr "没有发现相应的说明。"
 
-#: dselect/method.cc:67
+#: dselect/method.cc
 #, c-format
 msgid ""
 "\n"
@@ -1039,7 +1049,7 @@ msgstr ""
 "\n"
 "%s：%s\n"
 
-#: dselect/method.cc:70
+#: dselect/method.cc
 msgid ""
 "\n"
 "Press <enter> to continue."
@@ -1047,192 +1057,202 @@ msgstr ""
 "\n"
 "摁 <回车> 继续。"
 
-#: dselect/method.cc:82
+#: dselect/method.cc
 msgid "cannot unlock access method area"
 msgstr ""
 
-#: dselect/method.cc:96
+#: dselect/method.cc
 #, fuzzy
 #| msgid " does not appear to be available\n"
 msgid "no access methods are available"
 msgstr " 看上去应该不可用\n"
 
-#: dselect/method.cc:115
+#: dselect/method.cc
 msgid "requested operation requires superuser privilege"
 msgstr ""
 
-#: dselect/method.cc:118
+#: dselect/method.cc
 #, fuzzy
 #| msgid "Choose the access method to use."
 msgid "cannot open or create access method lockfile"
 msgstr "选择所使用的安装来源。"
 
-#: dselect/method.cc:125
+#: dselect/method.cc
 msgid "the access method area is already locked"
 msgstr ""
 
-#: dselect/method.cc:128
+#: dselect/method.cc
 #, fuzzy
 #| msgid "dselect - list of access methods"
 msgid "cannot lock access method area"
 msgstr "dselect - 安装手段的列表"
 
-#: dselect/method.cc:161
+#: dselect/method.cc
 #, c-format
 msgid "Press <enter> to continue.\n"
 msgstr "请摁 <回车> 继续。\n"
 
-#: dselect/method.cc:162
+#: dselect/method.cc
 #, fuzzy
 msgid "<standard error>"
 msgstr "写标准错误输出时出错"
 
-#: dselect/method.cc:165
+#: dselect/method.cc
 msgid "error reading acknowledgement of program failure message"
 msgstr "读取程序的错误提示时出错"
 
-#: dselect/method.cc:187
+#: dselect/method.cc
 msgid "no access method is selected or configured"
 msgstr ""
 
-#: dselect/method.cc:196
+#: dselect/method.cc
 msgid "update available list script"
 msgstr "更新可用软件包列表的脚本"
 
-#: dselect/method.cc:200
+#: dselect/method.cc
 msgid "installation script"
 msgstr "软件包安装脚本"
 
-#: dselect/method.cc:246
+#: dselect/method.cc
 msgid "query/setup script"
 msgstr "查询/设置脚本"
 
-#: dselect/methparse.cc:53
+#: dselect/methparse.cc
 #, c-format
 msgid "syntax error in method options file `%.250s' -- %s"
 msgstr "安装手段的选项文件“%.250s”中有语法错误 -- %s"
 
-#: dselect/methparse.cc:59
+#: dselect/methparse.cc
 #, c-format
 msgid "error reading options file `%.250s'"
 msgstr "读取安装手段的选项文件“%.250s”时出错"
 
-#: dselect/methparse.cc:93
+#: dselect/methparse.cc
 #, c-format
 msgid "unable to read `%.250s' directory for reading methods"
 msgstr "无法读取“%.250s”目录以获取安装手段的相关信息"
 
-#: dselect/methparse.cc:109
+#: dselect/methparse.cc
 #, c-format
 msgid "method `%.250s' has name that is too long (%d > %d characters)"
 msgstr "安装手段“%.250s”的名字超长(%d > %d 个字符)"
 
-#: dselect/methparse.cc:120
+#: dselect/methparse.cc
 #, c-format
 msgid "unable to access method script `%.250s'"
 msgstr "无法访问手段脚本“%.250s”"
 
-#: dselect/methparse.cc:126
+#: dselect/methparse.cc
 #, c-format
 msgid "unable to read method options file `%.250s'"
 msgstr "无法读取手段脚本“%.250s”"
 
-#: dselect/methparse.cc:150
+#: dselect/methparse.cc
 msgid "non-digit where digit wanted"
 msgstr "在本该有数字的地方没有发现数字"
 
-#: dselect/methparse.cc:153
-msgid "EOF in index string"
+#: dselect/methparse.cc
+#, fuzzy
+#| msgid "EOF in index string"
+msgid "end of file in index string"
 msgstr "在索引字串中发现了 EOF"
 
-#: dselect/methparse.cc:156
+#: dselect/methparse.cc
 msgid "index string too long"
 msgstr "索引字串超长"
 
-#: dselect/methparse.cc:159
+#: dselect/methparse.cc
 msgid "newline before option name start"
 msgstr "在选项名开始前就发现了换行符"
 
-#: dselect/methparse.cc:161
-msgid "EOF before option name start"
-msgstr "在选项名开始前就发现了 EOF"
+#: dselect/methparse.cc
+#, fuzzy
+#| msgid "newline before option name start"
+msgid "end of file before option name start"
+msgstr "在选项名开始前就发现了换行符"
 
-#: dselect/methparse.cc:165
+#: dselect/methparse.cc
 msgid "nonalpha where option name start wanted"
 msgstr "在本该是选项名开头的地方不是字母"
 
-#: dselect/methparse.cc:167
+#: dselect/methparse.cc
 msgid "non-alphanum in option name"
 msgstr "在选项名中发现了既不是字母也不是数字的字符"
 
-#: dselect/methparse.cc:170
-msgid "EOF in option name"
+#: dselect/methparse.cc
+#, fuzzy
+#| msgid "EOF in option name"
+msgid "end of file in option name"
 msgstr "在选项名中发现了 EOF"
 
-#: dselect/methparse.cc:175
+#: dselect/methparse.cc
 msgid "newline before summary"
 msgstr "在概述前发现了换行符"
 
-#: dselect/methparse.cc:177
-msgid "EOF before summary"
-msgstr "在概述前发现了 EOF"
+#: dselect/methparse.cc
+#, fuzzy
+#| msgid "newline before summary"
+msgid "end of file before summary"
+msgstr "在概述前发现了换行符"
 
-#: dselect/methparse.cc:183
-msgid "EOF in summary - missing newline"
+#: dselect/methparse.cc
+#, fuzzy
+#| msgid "EOF in summary - missing newline"
+msgid "end of file in summary - missing newline"
 msgstr "在概述中发现了 EOF - 本该是换行符的"
 
-#: dselect/methparse.cc:193
+#: dselect/methparse.cc
 #, c-format
 msgid "unable to open option description file `%.250s'"
 msgstr "无法打开选项说明文件“%.250s”"
 
-#: dselect/methparse.cc:197
+#: dselect/methparse.cc
 #, c-format
 msgid "unable to stat option description file `%.250s'"
 msgstr "无法 stat 选项说明文件“%.250s”"
 
-#: dselect/methparse.cc:201
+#: dselect/methparse.cc
 #, c-format
 msgid "failed to read option description file `%.250s'"
 msgstr "读取选项说明文件“%.250s”失败"
 
-#: dselect/methparse.cc:204
+#: dselect/methparse.cc
 #, c-format
 msgid "error during read of option description file `%.250s'"
 msgstr "读取选项说明文件“%.250s”时出错"
 
-#: dselect/methparse.cc:227
+#: dselect/methparse.cc
 #, c-format
 msgid "error during read of method options file `%.250s'"
 msgstr "读取安装手段的选项文件“%.250s”时出错"
 
-#: dselect/methparse.cc:250
+#: dselect/methparse.cc
 #, c-format
 msgid "unable to open current option file `%.250s'"
 msgstr "无法打开当前的选项文件“%.250s”"
 
-#: dselect/methparse.cc:286
+#: dselect/methparse.cc
 #, c-format
 msgid "unable to write new option to `%.250s'"
 msgstr "无法写入新的选项文件“%.250s”"
 
-#: dselect/pkgdisplay.cc:36
+#: dselect/pkgdisplay.cc
 msgid "new package"
 msgstr "新到软件包"
 
-#: dselect/pkgdisplay.cc:37
+#: dselect/pkgdisplay.cc
 msgid "install"
 msgstr "安装"
 
-#: dselect/pkgdisplay.cc:38
+#: dselect/pkgdisplay.cc
 msgid "hold"
 msgstr "保持"
 
-#: dselect/pkgdisplay.cc:39
+#: dselect/pkgdisplay.cc
 msgid "remove"
 msgstr "删除"
 
-#: dselect/pkgdisplay.cc:40
+#: dselect/pkgdisplay.cc
 msgid "purge"
 msgstr "清除"
 
@@ -1240,331 +1260,325 @@ msgstr "清除"
 #. * the empty string to store information about the translation. DO NOT
 #. * CHANGE THAT IN A TRANSLATION! The code really relies on that being
 #. * a single space.
-#: dselect/pkgdisplay.cc:47
+#: dselect/pkgdisplay.cc
 msgid " "
 msgstr " "
 
-#: dselect/pkgdisplay.cc:48
+#: dselect/pkgdisplay.cc
 msgid "REINSTALL"
 msgstr "【重新安装】"
 
-#: dselect/pkgdisplay.cc:51
+#: dselect/pkgdisplay.cc
 msgid "not installed"
 msgstr "没有安装"
 
-#: dselect/pkgdisplay.cc:52
+#: dselect/pkgdisplay.cc
 msgid "removed (configs remain)"
 msgstr "删除(残存配置文件)"
 
-#: dselect/pkgdisplay.cc:53
+#: dselect/pkgdisplay.cc
 msgid "half installed"
 msgstr "部分安装"
 
-#: dselect/pkgdisplay.cc:54
+#: dselect/pkgdisplay.cc
 msgid "unpacked (not set up)"
 msgstr "已解压缩(尚未设置)"
 
-#: dselect/pkgdisplay.cc:55
+#: dselect/pkgdisplay.cc
 msgid "half configured (config failed)"
 msgstr ""
 
-#: dselect/pkgdisplay.cc:56
+#: dselect/pkgdisplay.cc
 msgid "awaiting trigger processing"
 msgstr ""
 
-#: dselect/pkgdisplay.cc:57
+#: dselect/pkgdisplay.cc
 msgid "triggered"
 msgstr ""
 
-#: dselect/pkgdisplay.cc:58
+#: dselect/pkgdisplay.cc
 msgid "installed"
 msgstr "已安装完毕"
 
-#: dselect/pkgdisplay.cc:61
+#: dselect/pkgdisplay.cc
 msgid "Required"
 msgstr "需要"
 
-#: dselect/pkgdisplay.cc:62
+#: dselect/pkgdisplay.cc
 msgid "Important"
 msgstr "重要"
 
-#: dselect/pkgdisplay.cc:63
+#: dselect/pkgdisplay.cc
 msgid "Standard"
 msgstr "标准"
 
-#: dselect/pkgdisplay.cc:64
+#: dselect/pkgdisplay.cc
 msgid "Optional"
 msgstr "可选"
 
-#: dselect/pkgdisplay.cc:65
+#: dselect/pkgdisplay.cc
 msgid "Extra"
 msgstr "额外"
 
-#: dselect/pkgdisplay.cc:66
-msgid "!Bug!"
-msgstr "!瑕疵!"
-
-#: dselect/pkgdisplay.cc:67
+#: dselect/pkgdisplay.cc
 msgid "Unclassified"
 msgstr "未归类"
 
-#: dselect/pkgdisplay.cc:70
+#: dselect/pkgdisplay.cc
 msgid "suggests"
 msgstr "建议"
 
-#: dselect/pkgdisplay.cc:71
+#: dselect/pkgdisplay.cc
 msgid "recommends"
 msgstr "推荐"
 
-#: dselect/pkgdisplay.cc:72
+#: dselect/pkgdisplay.cc
 msgid "depends on"
 msgstr "依赖于"
 
-#: dselect/pkgdisplay.cc:73
+#: dselect/pkgdisplay.cc
 msgid "pre-depends on"
 msgstr "预依赖于"
 
-#: dselect/pkgdisplay.cc:74
+#: dselect/pkgdisplay.cc
 msgid "breaks"
 msgstr ""
 
-#: dselect/pkgdisplay.cc:75
+#: dselect/pkgdisplay.cc
 msgid "conflicts with"
 msgstr "与之冲突"
 
-#: dselect/pkgdisplay.cc:76
+#: dselect/pkgdisplay.cc
 msgid "provides"
 msgstr "提供"
 
-#: dselect/pkgdisplay.cc:77
+#: dselect/pkgdisplay.cc
 msgid "replaces"
 msgstr "替换"
 
-#: dselect/pkgdisplay.cc:78
+#: dselect/pkgdisplay.cc
 msgid "enhances"
 msgstr "有助于"
 
-#: dselect/pkgdisplay.cc:81
+#: dselect/pkgdisplay.cc
 msgid "Req"
 msgstr "需"
 
-#: dselect/pkgdisplay.cc:82
+#: dselect/pkgdisplay.cc
 msgid "Imp"
 msgstr "要"
 
-#: dselect/pkgdisplay.cc:83
+#: dselect/pkgdisplay.cc
 msgid "Std"
 msgstr "标"
 
-#: dselect/pkgdisplay.cc:84
+#: dselect/pkgdisplay.cc
 msgid "Opt"
 msgstr "选"
 
-#: dselect/pkgdisplay.cc:85
+#: dselect/pkgdisplay.cc
 msgid "Xtr"
 msgstr "余"
 
-#: dselect/pkgdisplay.cc:86
+#: dselect/pkgdisplay.cc
 msgid "bUG"
 msgstr "瑕"
 
-#: dselect/pkgdisplay.cc:87
+#: dselect/pkgdisplay.cc
 msgid "?"
 msgstr "?"
 
-#: dselect/pkgdisplay.cc:95 dselect/pkgdisplay.cc:115
+#: dselect/pkgdisplay.cc
 msgid "Broken"
 msgstr "有故障"
 
-#: dselect/pkgdisplay.cc:96
+#: dselect/pkgdisplay.cc
 msgid "New"
 msgstr "新的"
 
-#: dselect/pkgdisplay.cc:97
-msgid "Updated"
-msgstr "有更新"
+#: dselect/pkgdisplay.cc
+msgid "Upgradable"
+msgstr ""
 
-#: dselect/pkgdisplay.cc:98
+#: dselect/pkgdisplay.cc
 msgid "Obsolete/local"
 msgstr "淘汰/本地"
 
-#: dselect/pkgdisplay.cc:99
-msgid "Up-to-date"
-msgstr "已更新"
+#: dselect/pkgdisplay.cc
+msgid "Installed"
+msgstr "已安装"
 
-#: dselect/pkgdisplay.cc:100
+#: dselect/pkgdisplay.cc
 msgid "Available"
 msgstr "可用"
 
-#: dselect/pkgdisplay.cc:101 dselect/pkgdisplay.cc:117
+#: dselect/pkgdisplay.cc
 msgid "Removed"
 msgstr "已删除"
 
-#: dselect/pkgdisplay.cc:102 dselect/pkgdisplay.cc:111
+#: dselect/pkgdisplay.cc
 msgid "Brokenly installed packages"
 msgstr "有故障的已安装软件包"
 
-#: dselect/pkgdisplay.cc:103
+#: dselect/pkgdisplay.cc
 msgid "Newly available packages"
 msgstr "新的可用软件包"
 
-#: dselect/pkgdisplay.cc:104
-msgid "Updated packages (newer version is available)"
-msgstr "软件包有更新版本(有更高的版本可用了)"
+#: dselect/pkgdisplay.cc
+#, fuzzy
+#| msgid "Newly available packages"
+msgid "Upgradable packages"
+msgstr "新的可用软件包"
 
-#: dselect/pkgdisplay.cc:105
-msgid "Obsolete and local packages present on system"
+#: dselect/pkgdisplay.cc
+#, fuzzy
+#| msgid "Obsolete and local packages present on system"
+msgid "Obsolete and locally created packages"
 msgstr "系统中安装这些的软件包是已淘汰的和本地的"
 
-#: dselect/pkgdisplay.cc:106
-msgid "Up to date installed packages"
-msgstr "安装了的软件包版本是最新的"
+#: dselect/pkgdisplay.cc
+msgid "Installed packages"
+msgstr "已经安装的软件包"
 
-#: dselect/pkgdisplay.cc:107
-msgid "Available packages (not currently installed)"
-msgstr "可用的软件包(目前没有被安装)"
+#: dselect/pkgdisplay.cc
+#, fuzzy
+#| msgid "Up to date installed packages"
+msgid "Available not installed packages"
+msgstr "安装了的软件包版本是最新的"
 
-#: dselect/pkgdisplay.cc:108
+#: dselect/pkgdisplay.cc
 msgid "Removed and no longer available packages"
 msgstr "被删除而且不再可用的软件包"
 
-#: dselect/pkgdisplay.cc:112
-msgid "Installed packages"
-msgstr "已经安装的软件包"
-
-#: dselect/pkgdisplay.cc:113
+#: dselect/pkgdisplay.cc
 msgid "Removed packages (configuration still present)"
 msgstr "被删除的软件包 (其配置文件仍然存在于系统中)"
 
-#: dselect/pkgdisplay.cc:114
+#: dselect/pkgdisplay.cc
 msgid "Purged packages and those never installed"
 msgstr "被完全清除的软件包以及那些从未被安装过的软件包"
 
-#: dselect/pkgdisplay.cc:116
-msgid "Installed"
-msgstr "已安装"
-
-#: dselect/pkgdisplay.cc:118
+#: dselect/pkgdisplay.cc
 msgid "Purged"
 msgstr "已清除"
 
-#: dselect/pkgdisplay.cc:138
+#: dselect/pkgdisplay.cc
 msgid "Error"
 msgstr "错误"
 
-#: dselect/pkgdisplay.cc:139
+#: dselect/pkgdisplay.cc
 msgid "Installed?"
 msgstr "已安装？"
 
-#: dselect/pkgdisplay.cc:140
+#: dselect/pkgdisplay.cc
 msgid "Old mark"
 msgstr "原有标记"
 
-#: dselect/pkgdisplay.cc:141
+#: dselect/pkgdisplay.cc
 msgid "Marked for"
 msgstr "现标记为"
 
-#: dselect/pkgdisplay.cc:143
+#: dselect/pkgdisplay.cc
 msgid "EIOM"
 msgstr "EIOM"
 
-#: dselect/pkgdisplay.cc:147 dselect/pkgdisplay.cc:150
+#: dselect/pkgdisplay.cc
 msgid "Section"
 msgstr "所属大类"
 
-#: dselect/pkgdisplay.cc:148
+#: dselect/pkgdisplay.cc
 msgid "Priority"
 msgstr "优先级"
 
-#: dselect/pkgdisplay.cc:152
+#: dselect/pkgdisplay.cc
 msgid "Package"
 msgstr "软件包名"
 
-#: dselect/pkgdisplay.cc:161 dselect/pkgdisplay.cc:165
+#: dselect/pkgdisplay.cc
 #, fuzzy
 #| msgid "Avail.ver"
 msgid "Avail.arch"
 msgstr "可用版本"
 
-#: dselect/pkgdisplay.cc:164
+#: dselect/pkgdisplay.cc
 #, fuzzy
 #| msgid "Inst.ver"
 msgid "Inst.arch"
 msgstr "安装版本"
 
-#: dselect/pkgdisplay.cc:178 dselect/pkgdisplay.cc:182
+#: dselect/pkgdisplay.cc
 msgid "Avail.ver"
 msgstr "可用版本"
 
-#: dselect/pkgdisplay.cc:181
+#: dselect/pkgdisplay.cc
 msgid "Inst.ver"
 msgstr "安装版本"
 
-#: dselect/pkgdisplay.cc:197
+#: dselect/pkgdisplay.cc
 msgid "dselect - recursive package listing"
 msgstr "dselect - 递归地列出软件包"
 
-#: dselect/pkgdisplay.cc:199
+#: dselect/pkgdisplay.cc
 msgid "dselect - inspection of package states"
 msgstr "dselect - 检视软件包的状态"
 
-#: dselect/pkgdisplay.cc:200
+#: dselect/pkgdisplay.cc
 msgid "dselect - main package listing"
 msgstr "dselect - 软件包主列表"
 
-#: dselect/pkgdisplay.cc:208
+#: dselect/pkgdisplay.cc
 msgid " (by section)"
 msgstr " (按所属大类)"
 
-#: dselect/pkgdisplay.cc:211
+#: dselect/pkgdisplay.cc
 msgid " (avail., section)"
 msgstr " (按是否可用和所属大类)"
 
-#: dselect/pkgdisplay.cc:214
+#: dselect/pkgdisplay.cc
 msgid " (status, section)"
 msgstr " (按状态和所属大类)"
 
-#: dselect/pkgdisplay.cc:223
+#: dselect/pkgdisplay.cc
 msgid " (by priority)"
 msgstr " (按优先级)"
 
-#: dselect/pkgdisplay.cc:226
+#: dselect/pkgdisplay.cc
 msgid " (avail., priority)"
 msgstr " (按是否可用和优先级)"
 
-#: dselect/pkgdisplay.cc:229
+#: dselect/pkgdisplay.cc
 msgid " (status, priority)"
 msgstr " (按状态和优先级)"
 
-#: dselect/pkgdisplay.cc:238
+#: dselect/pkgdisplay.cc
 msgid " (alphabetically)"
 msgstr " (按字母表顺序)"
 
-#: dselect/pkgdisplay.cc:241
+#: dselect/pkgdisplay.cc
 msgid " (by availability)"
 msgstr " (按是否可用)"
 
-#: dselect/pkgdisplay.cc:244
+#: dselect/pkgdisplay.cc
 msgid " (by status)"
 msgstr " (按状态)"
 
-#: dselect/pkgdisplay.cc:259
+#: dselect/pkgdisplay.cc
 msgid " mark:+/=/- terse:v help:?"
 msgstr " 标记:+/=/- 简略:v 帮助:?"
 
-#: dselect/pkgdisplay.cc:260
+#: dselect/pkgdisplay.cc
 msgid " mark:+/=/- verbose:v help:?"
 msgstr " 标记:+/=/- 详尽:v 帮助:?"
 
-#: dselect/pkgdisplay.cc:262
+#: dselect/pkgdisplay.cc
 msgid " terse:v help:?"
 msgstr " 简略:v 帮助:?"
 
-#: dselect/pkgdisplay.cc:263
+#: dselect/pkgdisplay.cc
 msgid " verbose:v help:?"
 msgstr " 详尽:v 帮助:?"
 
-#: dselect/pkginfo.cc:85
+#: dselect/pkginfo.cc
 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 "
@@ -1583,86 +1597,118 @@ msgstr ""
 "您可以摁“o”或者“O”来以不同的规则排序，这样您就能给不同类型的软件包作上\n"
 "标记了。"
 
-#: dselect/pkginfo.cc:98
+#: dselect/pkginfo.cc
 #, fuzzy
 msgid "Interrelationships"
 msgstr "软件包的相互关系"
 
-#: dselect/pkginfo.cc:117
+#: dselect/pkginfo.cc
 #, fuzzy
 msgid "No description available."
 msgstr "无相关介绍。"
 
-#: dselect/pkginfo.cc:135
+#: dselect/pkginfo.cc
 #, fuzzy
 msgid "Installed control file information"
 msgstr "为下面软件包安装的控制信息"
 
-#: dselect/pkginfo.cc:151
+#: dselect/pkginfo.cc
 #, fuzzy
 msgid "Available control file information"
 msgstr "可用的控制信息的版本"
 
-#: dselect/pkglist.cc:425
+#: dselect/pkglist.cc
 #, fuzzy
 #| msgid "Installed packages"
 msgid "there are no packages"
 msgstr "已经安装的软件包"
 
-#: dselect/pkglist.cc:521
+#: dselect/pkglist.cc
 msgid "invalid search option given"
 msgstr "指定了无效的搜索选项"
 
-#: dselect/pkglist.cc:536
+#: dselect/pkglist.cc
 msgid "error in regular expression"
 msgstr "正则表达式有误"
 
-#: dselect/pkgsublist.cc:111
+#: dselect/pkgsublist.cc
 msgid " does not appear to be available\n"
 msgstr " 看上去应该不可用\n"
 
-#: dselect/pkgsublist.cc:131
+#: dselect/pkgsublist.cc
 msgid " or "
 msgstr " 或者 "
 
-#: dselect/pkgtop.cc:58
+#: dselect/pkgtop.cc
 msgid "All"
 msgstr "所有"
 
-#: dselect/pkgtop.cc:80
+#: dselect/pkgtop.cc
 msgid "All packages"
 msgstr "所有软件包"
 
-#: dselect/pkgtop.cc:84
+#: dselect/pkgtop.cc
 #, c-format
 msgid "%s packages without a section"
 msgstr "不指定大类 %s 软件包"
 
-#: dselect/pkgtop.cc:86
+#: dselect/pkgtop.cc
 #, c-format
 msgid "%s packages in section %s"
 msgstr "在 %2$s 大类中 %1$s 软件包"
 
-#: dselect/pkgtop.cc:92
+#: dselect/pkgtop.cc
 #, c-format
 msgid "%s %s packages"
 msgstr "%s %s 软件包"
 
-#: dselect/pkgtop.cc:96
+#: dselect/pkgtop.cc
 #, c-format
 msgid "%s %s packages without a section"
 msgstr "不指定大类 %s %s 软件包"
 
-#: dselect/pkgtop.cc:98
+#: dselect/pkgtop.cc
 #, c-format
 msgid "%s %s packages in section %s"
 msgstr "在 %3$s 大类中 %1$s %2$s 软件包"
 
-#: dselect/pkgtop.cc:119
+#: dselect/pkgtop.cc
 #, c-format
 msgid "%-*s %s%s%s;  %s (was: %s).  %s"
 msgstr "%-*s %s%s%s;  %s (曾为：%s).  %s"
 
+#, fuzzy
+#~| msgid "Section"
+#~ msgid "Actions:\n"
+#~ msgstr "所属大类"
+
+#~ msgid "Colours:\n"
+#~ msgstr "颜色：\n"
+
+#~ msgid "Attributes:\n"
+#~ msgstr "属性：\n"
+
+#~ msgid "EOF before option name start"
+#~ msgstr "在选项名开始前就发现了 EOF"
+
+#~ msgid "EOF before summary"
+#~ msgstr "在概述前发现了 EOF"
+
+#~ msgid "!Bug!"
+#~ msgstr "!瑕疵!"
+
+#~ msgid "Updated"
+#~ msgstr "有更新"
+
+#~ msgid "Up-to-date"
+#~ msgstr "已更新"
+
+#~ msgid "Updated packages (newer version is available)"
+#~ msgstr "软件包有更新版本(有更高的版本可用了)"
+
+#~ msgid "Available packages (not currently installed)"
+#~ msgstr "可用的软件包(目前没有被安装)"
+
 #~ msgid ""
 #~ "Actions:\n"
 #~ "  access update select install config remove quit\n"
diff --git a/dselect/po/zh_TW.po b/dselect/po/zh_TW.po
index 8c56c71a8..5dd3aa511 100644
--- a/dselect/po/zh_TW.po
+++ b/dselect/po/zh_TW.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dselect 1.13\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2014-12-23 18:12+0100\n"
+"POT-Creation-Date: 2015-04-06 09:37+0200\n"
 "PO-Revision-Date: 2012-07-07 17:58+0800\n"
 "Last-Translator: Asho Yeh <ashoyeh@gmail.com>\n"
 "Language-Team: Chinese (traditional) <debian-l10n-chinese@lists.debian.org>\n"
@@ -18,27 +18,27 @@ msgstr ""
 "X-Poedit-Language: Chinese\n"
 "X-Poedit-Country: TAIWAN\n"
 
-#: dselect/basecmds.cc:125
+#: dselect/basecmds.cc
 msgid "Search for ? "
 msgstr "想搜尋什麼？"
 
-#: dselect/basecmds.cc:149
+#: dselect/basecmds.cc
 msgid "Error: "
 msgstr "錯誤："
 
-#: dselect/basecmds.cc:180
+#: dselect/basecmds.cc
 msgid "Help: "
 msgstr "幫助："
 
-#: dselect/basecmds.cc:186
+#: dselect/basecmds.cc
 msgid "Press ? for help menu, . for next topic, <space> to exit help."
 msgstr "按 ? 可以彈出幫助選單，用 <space> 能進入下個主題並離開幫助畫面。"
 
-#: dselect/basecmds.cc:193
+#: dselect/basecmds.cc
 msgid "Help information is available under the following topics:"
 msgstr "您可獲得有關下列主題的幫助訊息："
 
-#: dselect/basecmds.cc:201
+#: dselect/basecmds.cc
 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. "
@@ -46,239 +46,239 @@ msgstr ""
 "請按上面列表中的按鍵，<space> 或“q”可退出幫助界面，\n"
 "或者用“.”(full stop)來依次閱讀幫助頁面。"
 
-#: dselect/basecmds.cc:207
+#: dselect/basecmds.cc
 msgid "error reading keyboard in help"
 msgstr "在幫助界面讀取鍵盤輸入時出錯"
 
-#: dselect/baselist.cc:60
+#: dselect/baselist.cc
 msgid "ioctl(TIOCGWINSZ) failed"
 msgstr "ioctl(TIOCGWINSZ) 失敗"
 
-#: dselect/baselist.cc:63
+#: dselect/baselist.cc
 msgid "doupdate in SIGWINCH handler failed"
 msgstr "在 SIGWINCH 處理程式中 doupdate 失敗了"
 
-#: dselect/baselist.cc:72
+#: dselect/baselist.cc
 msgid "failed to restore old SIGWINCH sigact"
 msgstr "恢復原先的 SIGWINCH sigact 失敗"
 
-#: dselect/baselist.cc:75
+#: dselect/baselist.cc
 msgid "failed to restore old signal mask"
 msgstr "恢復原先的 signal mask 失敗"
 
-#: dselect/baselist.cc:86
+#: dselect/baselist.cc
 msgid "failed to get old signal mask"
 msgstr "擷取原先的 signal mask 失敗"
 
-#: dselect/baselist.cc:88
+#: dselect/baselist.cc
 msgid "failed to get old SIGWINCH sigact"
 msgstr "擷取原先的 SIGWINCH sigact 出錯"
 
-#: dselect/baselist.cc:93
+#: dselect/baselist.cc
 msgid "failed to block SIGWINCH"
 msgstr "無法阻塞 SIGWINCH 信號"
 
-#: dselect/baselist.cc:99
+#: dselect/baselist.cc
 msgid "failed to set new SIGWINCH sigact"
 msgstr "設定新的 SIGWINCH sigact 失敗"
 
-#: dselect/baselist.cc:174
+#: dselect/baselist.cc
 msgid "failed to allocate colour pair"
 msgstr "分配顏色對失敗"
 
-#: dselect/baselist.cc:203
+#: dselect/baselist.cc
 msgid "failed to create title window"
 msgstr "建立標題視窗失敗"
 
-#: dselect/baselist.cc:207
+#: dselect/baselist.cc
 msgid "failed to create whatinfo window"
 msgstr "建立 whatinfo 視窗失敗"
 
-#: dselect/baselist.cc:211
+#: dselect/baselist.cc
 msgid "failed to create baselist pad"
 msgstr "無法建立名稱列表的小視窗"
 
-#: dselect/baselist.cc:214
+#: dselect/baselist.cc
 msgid "failed to create heading pad"
 msgstr "無法建立標題小視窗"
 
-#: dselect/baselist.cc:218
+#: dselect/baselist.cc
 msgid "failed to create thisstate pad"
 msgstr "無法建立 thisstate 小視窗"
 
-#: dselect/baselist.cc:222
+#: dselect/baselist.cc
 msgid "failed to create info pad"
 msgstr "無法建立相關訊息小視窗"
 
-#: dselect/baselist.cc:227
+#: dselect/baselist.cc
 msgid "failed to create query window"
 msgstr "建立查詢視窗失敗"
 
-#: dselect/baselist.cc:298
+#: dselect/baselist.cc
 msgid "Keybindings"
 msgstr "快速鍵"
 
-#: dselect/baselist.cc:347
+#: dselect/baselist.cc
 #, c-format
 msgid "  -- %d%%, press "
 msgstr "  -- %d%%，請按 "
 
-#: dselect/baselist.cc:350
+#: dselect/baselist.cc
 #, c-format
 msgid "%s for more"
 msgstr "%s 繼續往下讀"
 
-#: dselect/baselist.cc:354
+#: dselect/baselist.cc
 #, c-format
 msgid "%s to go back"
 msgstr "%s 可以跳回原來的位置"
 
-#: dselect/bindings.cc:78
+#: dselect/bindings.cc
 msgid "[not bound]"
 msgstr "[未設定按鍵連結]"
 
-#: dselect/bindings.cc:82
+#: dselect/bindings.cc
 #, c-format
 msgid "[unk: %d]"
 msgstr "[未知：%d]"
 
-#: dselect/bindings.cc:141
+#: dselect/bindings.cc
 msgid "Scroll onwards through help/information"
 msgstr "在幫助文檔或相關訊息中滾動滑鼠"
 
-#: dselect/bindings.cc:142
+#: dselect/bindings.cc
 msgid "Scroll backwards through help/information"
 msgstr "在幫助或相關訊息中捲動頁面"
 
-#: dselect/bindings.cc:143
+#: dselect/bindings.cc
 msgid "Move up"
 msgstr "上移"
 
-#: dselect/bindings.cc:144
+#: dselect/bindings.cc
 msgid "Move down"
 msgstr "下移"
 
-#: dselect/bindings.cc:145
+#: dselect/bindings.cc
 msgid "Go to top of list"
 msgstr "跳到列表頂端"
 
-#: dselect/bindings.cc:146
+#: dselect/bindings.cc
 msgid "Go to end of list"
 msgstr "跳到列表底端"
 
-#: dselect/bindings.cc:147
+#: dselect/bindings.cc
 msgid "Request help (cycle through help screens)"
 msgstr "請求幫助(循環切換幫助界面)"
 
-#: dselect/bindings.cc:148
+#: dselect/bindings.cc
 msgid "Cycle through information displays"
 msgstr "循環切換訊息顯示"
 
-#: dselect/bindings.cc:149
+#: dselect/bindings.cc
 msgid "Redraw display"
 msgstr "重畫螢幕"
 
-#: dselect/bindings.cc:150
+#: dselect/bindings.cc
 msgid "Scroll onwards through list by 1 line"
 msgstr "在列表中向前滾動一行"
 
-#: dselect/bindings.cc:151
+#: dselect/bindings.cc
 msgid "Scroll backwards through list by 1 line"
 msgstr "在列表中向後滾動一行"
 
-#: dselect/bindings.cc:152
+#: dselect/bindings.cc
 msgid "Scroll onwards through help/information by 1 line"
 msgstr "在幫助或相關訊息中向前滾動一行"
 
-#: dselect/bindings.cc:153
+#: dselect/bindings.cc
 msgid "Scroll backwards through help/information by 1 line"
 msgstr "在幫助或相關訊息中向後滾動一行"
 
-#: dselect/bindings.cc:154
+#: dselect/bindings.cc
 msgid "Scroll onwards through list"
 msgstr "在列表中向前滾動"
 
-#: dselect/bindings.cc:155
+#: dselect/bindings.cc
 msgid "Scroll backwards through list"
 msgstr "在列表中向前滾動"
 
-#: dselect/bindings.cc:158
+#: dselect/bindings.cc
 msgid "Mark package(s) for installation"
 msgstr "把套件標記為“將要安裝”"
 
-#: dselect/bindings.cc:159
+#: dselect/bindings.cc
 msgid "Mark package(s) for deinstallation"
 msgstr "把套件標記為“將要移除”"
 
-#: dselect/bindings.cc:160
+#: dselect/bindings.cc
 msgid "Mark package(s) for deinstall and purge"
 msgstr "把套件標記為移除”"
 
-#: dselect/bindings.cc:161
+#: dselect/bindings.cc
 msgid "Make highlight more specific"
 msgstr "讓高亮顯示更易識別"
 
-#: dselect/bindings.cc:162
+#: dselect/bindings.cc
 msgid "Make highlight less specific"
 msgstr "讓高亮顯示較不易識別"
 
-#: dselect/bindings.cc:163
+#: dselect/bindings.cc
 msgid "Search for a package whose name contains a string"
 msgstr "搜尋名稱含有特定字串的套件"
 
-#: dselect/bindings.cc:164
+#: dselect/bindings.cc
 msgid "Repeat last search"
 msgstr "重復上次的搜尋"
 
-#: dselect/bindings.cc:165
+#: dselect/bindings.cc
 msgid "Swap sort order priority/section"
 msgstr "調整排序的依據 - 優先等級/類別"
 
-#: dselect/bindings.cc:166
+#: dselect/bindings.cc
 msgid "Quit, confirming, and checking dependencies"
 msgstr "退出，並確認操作而且對相依問題進行復查"
 
-#: dselect/bindings.cc:167
+#: dselect/bindings.cc
 msgid "Quit, confirming without check"
 msgstr "退出，並確認操作而且不再檢查"
 
-#: dselect/bindings.cc:168
+#: dselect/bindings.cc
 msgid "Quit, rejecting conflict/dependency suggestions"
 msgstr "退出，並拒絕有關衝突和相依問題的建議"
 
-#: dselect/bindings.cc:169
+#: dselect/bindings.cc
 msgid "Abort - quit without making changes"
 msgstr "中止操作 - 不作任何更改並退出"
 
-#: dselect/bindings.cc:170
+#: dselect/bindings.cc
 msgid "Revert to old state for all packages"
 msgstr "把所有套件的狀態恢復到修改前"
 
-#: dselect/bindings.cc:171
+#: dselect/bindings.cc
 msgid "Revert to suggested state for all packages"
 msgstr "把所有套件的狀態恢復到建議值"
 
-#: dselect/bindings.cc:172
+#: dselect/bindings.cc
 msgid "Revert to directly requested state for all packages"
 msgstr "把所有套件的狀態恢復到所要求的值"
 
-#: dselect/bindings.cc:173
+#: dselect/bindings.cc
 msgid "Revert to currently installed state for all packages"
 msgstr "把所有套件的狀態恢復到目前安裝的值"
 
-#: dselect/bindings.cc:176
+#: dselect/bindings.cc
 msgid "Select currently-highlighted access method"
 msgstr "選擇目前高亮顯示的存取方式"
 
-#: dselect/bindings.cc:177
+#: dselect/bindings.cc
 msgid "Quit without changing selected access method"
 msgstr "退出程序，而且不修改所選的存取方式"
 
-#: dselect/helpmsgs.cc:29
+#: dselect/helpmsgs.cc
 msgid "Keystrokes"
 msgstr "按鍵操作"
 
-#: dselect/helpmsgs.cc:29
+#: dselect/helpmsgs.cc
 #, fuzzy
 #| msgid ""
 #| "Motion keys: Next/Previous, Top/End, Up/Down, Backwards/Forwards:\n"
@@ -368,11 +368,11 @@ msgstr ""
 "索)\n"
 "   D     把所有套件的狀態改成到所要求的值   \\        重復上次的搜尋\n"
 
-#: dselect/helpmsgs.cc:55
+#: dselect/helpmsgs.cc
 msgid "Introduction to package selections"
 msgstr "套件選擇界面簡介"
 
-#: dselect/helpmsgs.cc:55
+#: dselect/helpmsgs.cc
 msgid ""
 "Welcome to dselect's main package listing.\n"
 "\n"
@@ -426,11 +426,11 @@ msgstr ""
 "\n"
 "現在您可以按 <enter> 鍵離開幫助界面，進入列表界面了。\n"
 
-#: dselect/helpmsgs.cc:80
+#: dselect/helpmsgs.cc
 msgid "Introduction to read-only package list browser"
 msgstr "唯讀的套件列表瀏覽界面簡介"
 
-#: dselect/helpmsgs.cc:80
+#: dselect/helpmsgs.cc
 msgid ""
 "Welcome to dselect's main package listing.\n"
 "\n"
@@ -465,11 +465,11 @@ msgstr ""
 "\n"
 "現在您可以通過按 <enter> 鍵離開幫助界面，進入列表界面了。\n"
 
-#: dselect/helpmsgs.cc:99
+#: dselect/helpmsgs.cc
 msgid "Introduction to conflict/dependency resolution sub-list"
 msgstr "用於解決衝突/相依問題的子列表的簡介"
 
-#: dselect/helpmsgs.cc:99
+#: dselect/helpmsgs.cc
 msgid ""
 "Dependency/conflict resolution - introduction.\n"
 "\n"
@@ -529,11 +529,11 @@ msgstr ""
 "請按<enter>離開幫助界面，進入子列表。\n"
 "需要幫助時，按“?”鍵。\n"
 
-#: dselect/helpmsgs.cc:125
+#: dselect/helpmsgs.cc
 msgid "Display, part 1: package listing and status chars"
 msgstr "顯示部位 1：套件列表及狀態簡寫"
 
-#: dselect/helpmsgs.cc:125
+#: dselect/helpmsgs.cc
 msgid ""
 "The top half of the screen shows a list of packages.  For each package you "
 "see\n"
@@ -590,11 +590,11 @@ msgstr ""
 "的版本號和當前可用的版本號（使用 shift-v 可以開啟或關閉其\n"
 "顯示)，以及簡要的介紹。\n"
 
-#: dselect/helpmsgs.cc:152
+#: dselect/helpmsgs.cc
 msgid "Display, part 2: list highlight; information display"
 msgstr "顯示部位 2：列表高亮顯示部分﹔相關訊息的顯示"
 
-#: dselect/helpmsgs.cc:152
+#: dselect/helpmsgs.cc
 msgid ""
 "* Highlight: One line in the package list will be highlighted.  It "
 "indicates\n"
@@ -638,11 +638,11 @@ msgstr ""
 "  您可以用“i”鍵在這些顯示內容中來回切換，用“I”來關閉相關訊息\n"
 "  的顯示，或者擴大它在螢幕中所占的篇幅直到幾乎完全佔據螢幕。\n"
 
-#: dselect/helpmsgs.cc:176
+#: dselect/helpmsgs.cc
 msgid "Introduction to method selection display"
 msgstr "安裝方式選擇界面的簡介"
 
-#: dselect/helpmsgs.cc:176
+#: dselect/helpmsgs.cc
 msgid ""
 "dselect and dpkg can do automatic installation, loading the package files to "
 "be\n"
@@ -679,11 +679,11 @@ msgstr ""
 "現在按“k”鍵就能見到按鍵操作的完整列表，也可以在幫助選單中按“k”鍵。\n"
 "按“?”就能呼出幫助選單。\n"
 
-#: dselect/helpmsgs.cc:196
+#: dselect/helpmsgs.cc
 msgid "Keystrokes for method selection"
 msgstr "選擇安裝方式的按鍵操作"
 
-#: dselect/helpmsgs.cc:196
+#: dselect/helpmsgs.cc
 msgid ""
 "Motion keys: Next/Previous, Top/End, Up/Down, Backwards/Forwards:\n"
 "  j, Down-arrow         k, Up-arrow             move highlight\n"
@@ -730,104 +730,104 @@ msgstr ""
 "  /                進行搜尋(按enter取消搜尋)\n"
 "  \\               重復上次的搜尋\n"
 
-#: dselect/main.cc:63
+#: dselect/main.cc
 msgid "Type dselect --help for help."
 msgstr "輸入 dselect --help 就可以閱讀幫助訊息。"
 
-#: dselect/main.cc:145
+#: dselect/main.cc
 msgid "a"
 msgstr "a"
 
-#: dselect/main.cc:145
+#: dselect/main.cc
 msgid "[A]ccess"
 msgstr "來源[A]"
 
-#: dselect/main.cc:145
+#: dselect/main.cc
 msgid "Choose the access method to use."
 msgstr "選擇所使用的安裝來源。"
 
-#: dselect/main.cc:146
+#: dselect/main.cc
 msgid "u"
 msgstr "u"
 
-#: dselect/main.cc:146
+#: dselect/main.cc
 msgid "[U]pdate"
 msgstr "更新[U]"
 
-#: dselect/main.cc:146
+#: dselect/main.cc
 msgid "Update list of available packages, if possible."
 msgstr "如果可能的話，更新可用的套件列表。"
 
-#: dselect/main.cc:147
+#: dselect/main.cc
 msgid "s"
 msgstr "s"
 
-#: dselect/main.cc:147
+#: dselect/main.cc
 msgid "[S]elect"
 msgstr "選擇[S]"
 
-#: dselect/main.cc:147
+#: dselect/main.cc
 msgid "Request which packages you want on your system."
 msgstr "對系統中安裝的套件作取捨。"
 
-#: dselect/main.cc:148
+#: dselect/main.cc
 msgid "i"
 msgstr "i"
 
-#: dselect/main.cc:148
+#: dselect/main.cc
 msgid "[I]nstall"
 msgstr "安裝[I]"
 
-#: dselect/main.cc:148
+#: dselect/main.cc
 msgid "Install and upgrade wanted packages."
 msgstr "安裝並升級之前指定的套件。"
 
-#: dselect/main.cc:149
+#: dselect/main.cc
 msgid "c"
 msgstr "c"
 
-#: dselect/main.cc:149
+#: dselect/main.cc
 msgid "[C]onfig"
 msgstr "設定[C]"
 
-#: dselect/main.cc:149
+#: dselect/main.cc
 msgid "Configure any packages that are unconfigured."
 msgstr "對所有尚未設定的套件進行設定"
 
-#: dselect/main.cc:150
+#: dselect/main.cc
 msgid "r"
 msgstr "r"
 
-#: dselect/main.cc:150
+#: dselect/main.cc
 msgid "[R]emove"
 msgstr "刪除[R]"
 
-#: dselect/main.cc:150
+#: dselect/main.cc
 msgid "Remove unwanted software."
 msgstr "刪除不需要的套件"
 
-#: dselect/main.cc:151
+#: dselect/main.cc
 msgid "q"
 msgstr "q"
 
-#: dselect/main.cc:151
+#: dselect/main.cc
 msgid "[Q]uit"
 msgstr "退出[Q]"
 
-#: dselect/main.cc:151
+#: dselect/main.cc
 msgid "Quit dselect."
 msgstr "退出 dselect 程序"
 
-#: dselect/main.cc:152
+#: dselect/main.cc
 msgid "menu"
 msgstr "選單"
 
-#: dselect/main.cc:157
+#: dselect/main.cc
 #, c-format
 msgid "Debian `%s' package handling frontend version %s.\n"
 msgstr "Debian “%s” 套件操作前端程式版本%s。\n"
 
-#: dselect/main.cc:160
+#: dselect/main.cc
 msgid ""
 "This is free software; see the GNU General Public License version 2 or\n"
 "later for copying conditions. There is NO warranty.\n"
@@ -835,29 +835,47 @@ msgstr ""
 "這是自由軟體﹔請參閱 GNU Public License \n"
 "第二或更新的版本。該軟體【不】提供任何擔保。\n"
 
-#: dselect/main.cc:169 dselect/main.cc:217
+#: dselect/main.cc
 msgid "<standard output>"
 msgstr "<標準輸出>"
 
-#: dselect/main.cc:180
-#, c-format
+#: dselect/main.cc
+#, fuzzy, c-format
+#| msgid ""
+#| "Usage: %s [<option> ...] [<action> ...]\n"
+#| "\n"
 msgid ""
-"Usage: %s [<option> ...] [<action> ...]\n"
+"Usage: %s [<option>...] [<command>...]\n"
 "\n"
 msgstr ""
 "用法：%s [<選項> ...][<選項> ...]\n"
 "\n"
 
-#: dselect/main.cc:184
+#: dselect/main.cc
 #, c-format
+msgid "Commands:\n"
+msgstr ""
+
+#: dselect/main.cc
+#, fuzzy, c-format
+#| msgid ""
+#| "Options:\n"
+#| "  --admindir <directory>     Use <directory> instead of %s.\n"
+#| "  --expert                   Turn on expert mode.\n"
+#| "  --debug <file> | -D<file>  Turn on debugging, sending output to "
+#| "<file>.\n"
+#| "  --colour | --color screenpart:[foreground],[background][:attr[+attr"
+#| "+...]]\n"
+#| "                             Configure screen colours.\n"
+#| "\n"
 msgid ""
 "Options:\n"
-"  --admindir <directory>     Use <directory> instead of %s.\n"
-"  --expert                   Turn on expert mode.\n"
-"  --debug <file> | -D<file>  Turn on debugging, sending output to <file>.\n"
-"  --colour | --color screenpart:[foreground],[background][:attr[+attr+...]]\n"
-"                             Configure screen colours.\n"
-"\n"
+"      --admindir <directory>       Use <directory> instead of %s.\n"
+"      --expert                     Turn on expert mode.\n"
+"  -D, --debug <file>               Turn on debugging, send output to "
+"<file>.\n"
+"      --color <color-spec>         Configure screen colors.\n"
+"      --colour <color-spec>        Ditto.\n"
 msgstr ""
 "選項：\n"
 "  --admindir <目錄名>     以 <目錄名> 取代 %s。\n"
@@ -867,72 +885,79 @@ msgstr ""
 "                             設定螢幕顏色。\n"
 "\n"
 
-#: dselect/main.cc:193
-#, c-format
+#: dselect/main.cc
+#, fuzzy, c-format
+#| msgid ""
+#| "  --help                     Show this help message.\n"
+#| "  --version                  Show the version.\n"
+#| "\n"
 msgid ""
-"  --help                     Show this help message.\n"
-"  --version                  Show the version.\n"
+"  -?, --help                       Show this help message.\n"
+"      --version                    Show the version.\n"
 "\n"
 msgstr ""
 "  --help                     顯示求助訊息。\n"
 "  --version                  顯示版本號。\n"
 "\n"
 
-#: dselect/main.cc:197
+#: dselect/main.cc
 #, c-format
-msgid "Actions:\n"
-msgstr "動作：\n"
+msgid ""
+"<color-spec> is <screen-part>:[<foreground>],[<background>][:"
+"<attr>[+<attr>]...]\n"
+msgstr ""
 
-#: dselect/main.cc:202
-#, c-format
-msgid "Screenparts:\n"
+#: dselect/main.cc
+#, fuzzy, c-format
+#| msgid "Screenparts:\n"
+msgid "<screen-part> is:"
 msgstr "顯示部分：\n"
 
-#: dselect/main.cc:207
+#: dselect/main.cc
 #, c-format
-msgid "Colours:\n"
-msgstr "顏色：\n"
+msgid "<color> is:"
+msgstr ""
 
-#: dselect/main.cc:212
+#: dselect/main.cc
 #, c-format
-msgid "Attributes:\n"
-msgstr "屬性：\n"
+msgid "<attr> is:"
+msgstr ""
 
-#: dselect/main.cc:232
+#: dselect/main.cc
 #, c-format
 msgid "couldn't open debug file `%.255s'\n"
 msgstr "無法打開偵錯檔案“%.255s”\n"
 
-#: dselect/main.cc:253
+#: dselect/main.cc
 #, c-format
 msgid "invalid %s '%s'"
 msgstr "無效的 %s “%s”"
 
-#: dselect/main.cc:272
+#: dselect/main.cc
 msgid "screen part"
 msgstr "顯示哪一部分"
 
-#: dselect/main.cc:278
+#: dselect/main.cc
 msgid "null colour specification"
 msgstr "未指定顏色"
 
-#: dselect/main.cc:286 dselect/main.cc:291
+#: dselect/main.cc
 msgid "colour"
 msgstr "顏色"
 
-#: dselect/main.cc:299
+#: dselect/main.cc
 msgid "colour attribute"
 msgstr "顏色屬性"
 
-#: dselect/main.cc:333
+#: dselect/main.cc
 msgid "Terminal does not appear to support cursor addressing.\n"
 msgstr "終端機不支持游標的定位。\n"
 
-#: dselect/main.cc:335
+#: dselect/main.cc
 msgid "Terminal does not appear to support highlighting.\n"
 msgstr "終端機不支持高亮顯示。\n"
 
-#: dselect/main.cc:337
+#: dselect/main.cc
 #, c-format
 msgid ""
 "Set your TERM variable correctly, use a better terminal,\n"
@@ -941,11 +966,11 @@ msgstr ""
 "請正確設定您的 TERM 變量，用一個更合適的終端機類型，\n"
 "或者改用針對單一套件的套裝管理工具 %s。\n"
 
-#: dselect/main.cc:340
+#: dselect/main.cc
 msgid "terminal lacks necessary features, giving up"
 msgstr "由於終端機缺乏必要的特色，只得中止操作"
 
-#: dselect/main.cc:425
+#: dselect/main.cc
 msgid ""
 "\n"
 "\n"
@@ -959,7 +984,7 @@ msgstr ""
 "按 <enter> 來確認。  用 ^L 來重繪螢幕。\n"
 "\n"
 
-#: dselect/main.cc:430
+#: dselect/main.cc
 msgid ""
 "Copyright (C) 1994-1996 Ian Jackson.\n"
 "Copyright (C) 2000,2001 Wichert Akkerman.\n"
@@ -967,7 +992,7 @@ msgstr ""
 "Copyright (C) 1994-1996 Ian Jackson.\n"
 "Copyright (C) 2000,2001 Wichert Akkerman.\n"
 
-#: dselect/main.cc:436
+#: dselect/main.cc
 msgid ""
 "\n"
 "\n"
@@ -977,57 +1002,57 @@ msgstr ""
 "\n"
 "唯讀存取：僅僅可以預覽被選中的項目！"
 
-#: dselect/main.cc:455
+#: dselect/main.cc
 msgid "failed to getch in main menu"
 msgstr "在主選單中 getch 失敗"
 
-#: dselect/main.cc:538
+#: dselect/main.cc
 #, c-format
 msgid "unknown action string `%.50s'"
 msgstr "不能識別的操作字串“%.50s”"
 
-#: dselect/methlist.cc:66
+#: dselect/methlist.cc
 msgid "Abbrev."
 msgstr "縮寫"
 
-#: dselect/methlist.cc:67 dselect/pkgdisplay.cc:188 dselect/pkginfo.cc:110
+#: dselect/methlist.cc dselect/pkgdisplay.cc dselect/pkginfo.cc
 msgid "Description"
 msgstr "簡介"
 
-#: dselect/methlist.cc:73
+#: dselect/methlist.cc
 msgid "dselect - list of access methods"
 msgstr "dselect - 存取方式的列表"
 
-#: dselect/methlist.cc:82
+#: dselect/methlist.cc
 #, c-format
 msgid "Access method `%s'."
 msgstr "存取方式“%s”。"
 
-#: dselect/methlist.cc:161 dselect/pkglist.cc:587
+#: dselect/methlist.cc dselect/pkglist.cc
 msgid "doupdate failed"
 msgstr "doupdate 失敗"
 
-#: dselect/methlist.cc:164 dselect/pkglist.cc:590
+#: dselect/methlist.cc dselect/pkglist.cc
 msgid "failed to unblock SIGWINCH"
 msgstr "無法解除阻塞 SIGWINCH 信號"
 
-#: dselect/methlist.cc:169 dselect/pkglist.cc:595
+#: dselect/methlist.cc dselect/pkglist.cc
 msgid "failed to re-block SIGWINCH"
 msgstr "重新阻塞 SIGWINCH 信號失敗"
 
-#: dselect/methlist.cc:170 dselect/pkglist.cc:597
+#: dselect/methlist.cc dselect/pkglist.cc
 msgid "getch failed"
 msgstr "getch 失敗"
 
-#: dselect/methlist.cc:187
+#: dselect/methlist.cc
 msgid "Explanation"
 msgstr "說明"
 
-#: dselect/methlist.cc:197
+#: dselect/methlist.cc
 msgid "No explanation available."
 msgstr "沒有發現相關說明。"
 
-#: dselect/method.cc:67
+#: dselect/method.cc
 #, c-format
 msgid ""
 "\n"
@@ -1038,7 +1063,7 @@ msgstr ""
 "\n"
 "%s：%s\n"
 
-#: dselect/method.cc:70
+#: dselect/method.cc
 msgid ""
 "\n"
 "Press <enter> to continue."
@@ -1046,191 +1071,201 @@ msgstr ""
 "\n"
 "按 <enter> 繼續。"
 
-#: dselect/method.cc:82
+#: dselect/method.cc
 msgid "cannot unlock access method area"
 msgstr ""
 
-#: dselect/method.cc:96
+#: dselect/method.cc
 #, fuzzy
 #| msgid " does not appear to be available\n"
 msgid "no access methods are available"
 msgstr " 看上去應該不可用\n"
 
-#: dselect/method.cc:115
+#: dselect/method.cc
 msgid "requested operation requires superuser privilege"
 msgstr ""
 
-#: dselect/method.cc:118
+#: dselect/method.cc
 #, fuzzy
 #| msgid "Choose the access method to use."
 msgid "cannot open or create access method lockfile"
 msgstr "選擇所使用的安裝來源。"
 
-#: dselect/method.cc:125
+#: dselect/method.cc
 msgid "the access method area is already locked"
 msgstr ""
 
-#: dselect/method.cc:128
+#: dselect/method.cc
 #, fuzzy
 #| msgid "dselect - list of access methods"
 msgid "cannot lock access method area"
 msgstr "dselect - 存取方式的列表"
 
-#: dselect/method.cc:161
+#: dselect/method.cc
 #, c-format
 msgid "Press <enter> to continue.\n"
 msgstr "請按 <enter> 繼續。\n"
 
-#: dselect/method.cc:162
+#: dselect/method.cc
 msgid "<standard error>"
 msgstr "<寫標準輸出時出錯>"
 
-#: dselect/method.cc:165
+#: dselect/method.cc
 msgid "error reading acknowledgement of program failure message"
 msgstr "讀取程序的錯誤提示時出錯"
 
-#: dselect/method.cc:187
+#: dselect/method.cc
 msgid "no access method is selected or configured"
 msgstr ""
 
-#: dselect/method.cc:196
+#: dselect/method.cc
 msgid "update available list script"
 msgstr "更新套件列表的script"
 
-#: dselect/method.cc:200
+#: dselect/method.cc
 msgid "installation script"
 msgstr "安裝script套件"
 
-#: dselect/method.cc:246
+#: dselect/method.cc
 msgid "query/setup script"
 msgstr "查詢/設定 script "
 
-#: dselect/methparse.cc:53
+#: dselect/methparse.cc
 #, c-format
 msgid "syntax error in method options file `%.250s' -- %s"
 msgstr "安裝方式的選項檔案“%.250s”中有語法錯誤 -- %s"
 
-#: dselect/methparse.cc:59
+#: dselect/methparse.cc
 #, c-format
 msgid "error reading options file `%.250s'"
 msgstr "讀取安裝方式的選項檔案“%.250s”時出錯"
 
-#: dselect/methparse.cc:93
+#: dselect/methparse.cc
 #, c-format
 msgid "unable to read `%.250s' directory for reading methods"
 msgstr "無法讀取“%.250s”目錄中關於安裝方式的訊息"
 
-#: dselect/methparse.cc:109
+#: dselect/methparse.cc
 #, c-format
 msgid "method `%.250s' has name that is too long (%d > %d characters)"
 msgstr "安裝方式“%.250s”的名字過長(%d > %d 個字元)"
 
-#: dselect/methparse.cc:120
+#: dselect/methparse.cc
 #, c-format
 msgid "unable to access method script `%.250s'"
 msgstr "無法取得 method script“%.250s”"
 
-#: dselect/methparse.cc:126
+#: dselect/methparse.cc
 #, c-format
 msgid "unable to read method options file `%.250s'"
 msgstr "無法讀取 method script“%.250s”"
 
-#: dselect/methparse.cc:150
+#: dselect/methparse.cc
 msgid "non-digit where digit wanted"
 msgstr "在本該有數字的地方沒有發現數字"
 
-#: dselect/methparse.cc:153
-msgid "EOF in index string"
+#: dselect/methparse.cc
+#, fuzzy
+#| msgid "EOF in index string"
+msgid "end of file in index string"
 msgstr "在索引字串中發現了 EOF"
 
-#: dselect/methparse.cc:156
+#: dselect/methparse.cc
 msgid "index string too long"
 msgstr "索引字串過長"
 
-#: dselect/methparse.cc:159
+#: dselect/methparse.cc
 msgid "newline before option name start"
 msgstr "在選項名稱開始前就發現了換行符號"
 
-#: dselect/methparse.cc:161
-msgid "EOF before option name start"
-msgstr "在選項名開始前就發現了 EOF"
+#: dselect/methparse.cc
+#, fuzzy
+#| msgid "newline before option name start"
+msgid "end of file before option name start"
+msgstr "在選項名稱開始前就發現了換行符號"
 
-#: dselect/methparse.cc:165
+#: dselect/methparse.cc
 msgid "nonalpha where option name start wanted"
 msgstr "在本該是選項名開頭的地方不是字母"
 
-#: dselect/methparse.cc:167
+#: dselect/methparse.cc
 msgid "non-alphanum in option name"
 msgstr "在選項名中發現了既不是字母也不是數字的字元"
 
-#: dselect/methparse.cc:170
-msgid "EOF in option name"
+#: dselect/methparse.cc
+#, fuzzy
+#| msgid "EOF in option name"
+msgid "end of file in option name"
 msgstr "在選項名中發現了 EOF"
 
-#: dselect/methparse.cc:175
+#: dselect/methparse.cc
 msgid "newline before summary"
 msgstr "在概述前發現了換行符號"
 
-#: dselect/methparse.cc:177
-msgid "EOF before summary"
-msgstr "在概述前發現了 EOF"
+#: dselect/methparse.cc
+#, fuzzy
+#| msgid "newline before summary"
+msgid "end of file before summary"
+msgstr "在概述前發現了換行符號"
 
-#: dselect/methparse.cc:183
-msgid "EOF in summary - missing newline"
+#: dselect/methparse.cc
+#, fuzzy
+#| msgid "EOF in summary - missing newline"
+msgid "end of file in summary - missing newline"
 msgstr "在概述中發現了 EOF - 本該是換行符號的"
 
-#: dselect/methparse.cc:193
+#: dselect/methparse.cc
 #, c-format
 msgid "unable to open option description file `%.250s'"
 msgstr "無法打開選項說明檔案“%.250s”"
 
-#: dselect/methparse.cc:197
+#: dselect/methparse.cc
 #, c-format
 msgid "unable to stat option description file `%.250s'"
 msgstr "無法 stat 選項說明檔案“%.250s”"
 
-#: dselect/methparse.cc:201
+#: dselect/methparse.cc
 #, c-format
 msgid "failed to read option description file `%.250s'"
 msgstr "讀取選項說明檔“%.250s”失敗"
 
-#: dselect/methparse.cc:204
+#: dselect/methparse.cc
 #, c-format
 msgid "error during read of option description file `%.250s'"
 msgstr "讀取選項說明檔“%.250s”時出錯"
 
-#: dselect/methparse.cc:227
+#: dselect/methparse.cc
 #, c-format
 msgid "error during read of method options file `%.250s'"
 msgstr "讀取安裝方式的選項檔案“%.250s”時出錯"
 
-#: dselect/methparse.cc:250
+#: dselect/methparse.cc
 #, c-format
 msgid "unable to open current option file `%.250s'"
 msgstr "無法打開目前的選項檔案“%.250s”"
 
-#: dselect/methparse.cc:286
+#: dselect/methparse.cc
 #, c-format
 msgid "unable to write new option to `%.250s'"
 msgstr "無法寫入新的選項檔案“%.250s”"
 
-#: dselect/pkgdisplay.cc:36
+#: dselect/pkgdisplay.cc
 msgid "new package"
 msgstr "新套件"
 
-#: dselect/pkgdisplay.cc:37
+#: dselect/pkgdisplay.cc
 msgid "install"
 msgstr "安裝"
 
-#: dselect/pkgdisplay.cc:38
+#: dselect/pkgdisplay.cc
 msgid "hold"
 msgstr "保持"
 
-#: dselect/pkgdisplay.cc:39
+#: dselect/pkgdisplay.cc
 msgid "remove"
 msgstr "刪除"
 
-#: dselect/pkgdisplay.cc:40
+#: dselect/pkgdisplay.cc
 msgid "purge"
 msgstr "清除"
 
@@ -1238,331 +1273,325 @@ msgstr "清除"
 #. * the empty string to store information about the translation. DO NOT
 #. * CHANGE THAT IN A TRANSLATION! The code really relies on that being
 #. * a single space.
-#: dselect/pkgdisplay.cc:47
+#: dselect/pkgdisplay.cc
 msgid " "
 msgstr " "
 
-#: dselect/pkgdisplay.cc:48
+#: dselect/pkgdisplay.cc
 msgid "REINSTALL"
 msgstr "【重新安裝】"
 
-#: dselect/pkgdisplay.cc:51
+#: dselect/pkgdisplay.cc
 msgid "not installed"
 msgstr "沒有安裝"
 
-#: dselect/pkgdisplay.cc:52
+#: dselect/pkgdisplay.cc
 msgid "removed (configs remain)"
 msgstr "刪除(殘存設定檔案)"
 
-#: dselect/pkgdisplay.cc:53
+#: dselect/pkgdisplay.cc
 msgid "half installed"
 msgstr "已部分安裝"
 
-#: dselect/pkgdisplay.cc:54
+#: dselect/pkgdisplay.cc
 msgid "unpacked (not set up)"
 msgstr "已解壓縮(尚未設定)"
 
-#: dselect/pkgdisplay.cc:55
+#: dselect/pkgdisplay.cc
 msgid "half configured (config failed)"
 msgstr "half configured (config failed)"
 
-#: dselect/pkgdisplay.cc:56
+#: dselect/pkgdisplay.cc
 msgid "awaiting trigger processing"
 msgstr "等待觸發中"
 
-#: dselect/pkgdisplay.cc:57
+#: dselect/pkgdisplay.cc
 msgid "triggered"
 msgstr "觸發"
 
-#: dselect/pkgdisplay.cc:58
+#: dselect/pkgdisplay.cc
 msgid "installed"
 msgstr "已安裝完畢"
 
-#: dselect/pkgdisplay.cc:61
+#: dselect/pkgdisplay.cc
 msgid "Required"
 msgstr "需要"
 
-#: dselect/pkgdisplay.cc:62
+#: dselect/pkgdisplay.cc
 msgid "Important"
 msgstr "重要"
 
-#: dselect/pkgdisplay.cc:63
+#: dselect/pkgdisplay.cc
 msgid "Standard"
 msgstr "標準"
 
-#: dselect/pkgdisplay.cc:64
+#: dselect/pkgdisplay.cc
 msgid "Optional"
 msgstr "可選擇"
 
-#: dselect/pkgdisplay.cc:65
+#: dselect/pkgdisplay.cc
 msgid "Extra"
 msgstr "額外"
 
-#: dselect/pkgdisplay.cc:66
-msgid "!Bug!"
-msgstr "!臭蟲!"
-
-#: dselect/pkgdisplay.cc:67
+#: dselect/pkgdisplay.cc
 msgid "Unclassified"
 msgstr "未歸類"
 
-#: dselect/pkgdisplay.cc:70
+#: dselect/pkgdisplay.cc
 msgid "suggests"
 msgstr "建議"
 
-#: dselect/pkgdisplay.cc:71
+#: dselect/pkgdisplay.cc
 msgid "recommends"
 msgstr "推薦"
 
-#: dselect/pkgdisplay.cc:72
+#: dselect/pkgdisplay.cc
 msgid "depends on"
 msgstr "相依於"
 
-#: dselect/pkgdisplay.cc:73
+#: dselect/pkgdisplay.cc
 msgid "pre-depends on"
 msgstr "預相依於"
 
-#: dselect/pkgdisplay.cc:74
+#: dselect/pkgdisplay.cc
 msgid "breaks"
 msgstr "取消"
 
-#: dselect/pkgdisplay.cc:75
+#: dselect/pkgdisplay.cc
 msgid "conflicts with"
 msgstr "與之衝突"
 
-#: dselect/pkgdisplay.cc:76
+#: dselect/pkgdisplay.cc
 msgid "provides"
 msgstr "提供"
 
-#: dselect/pkgdisplay.cc:77
+#: dselect/pkgdisplay.cc
 msgid "replaces"
 msgstr "替換"
 
-#: dselect/pkgdisplay.cc:78
+#: dselect/pkgdisplay.cc
 msgid "enhances"
 msgstr "有助於"
 
-#: dselect/pkgdisplay.cc:81
+#: dselect/pkgdisplay.cc
 msgid "Req"
 msgstr "需"
 
-#: dselect/pkgdisplay.cc:82
+#: dselect/pkgdisplay.cc
 msgid "Imp"
 msgstr "要"
 
-#: dselect/pkgdisplay.cc:83
+#: dselect/pkgdisplay.cc
 msgid "Std"
 msgstr "標"
 
-#: dselect/pkgdisplay.cc:84
+#: dselect/pkgdisplay.cc
 msgid "Opt"
 msgstr "選"
 
-#: dselect/pkgdisplay.cc:85
+#: dselect/pkgdisplay.cc
 msgid "Xtr"
 msgstr "餘"
 
-#: dselect/pkgdisplay.cc:86
+#: dselect/pkgdisplay.cc
 msgid "bUG"
 msgstr "瑕"
 
-#: dselect/pkgdisplay.cc:87
+#: dselect/pkgdisplay.cc
 msgid "?"
 msgstr "?"
 
-#: dselect/pkgdisplay.cc:95 dselect/pkgdisplay.cc:115
+#: dselect/pkgdisplay.cc
 msgid "Broken"
 msgstr "有故障"
 
-#: dselect/pkgdisplay.cc:96
+#: dselect/pkgdisplay.cc
 msgid "New"
 msgstr "新的"
 
-#: dselect/pkgdisplay.cc:97
-msgid "Updated"
-msgstr "有更新"
+#: dselect/pkgdisplay.cc
+msgid "Upgradable"
+msgstr ""
 
-#: dselect/pkgdisplay.cc:98
+#: dselect/pkgdisplay.cc
 msgid "Obsolete/local"
 msgstr "淘汰/本地"
 
-#: dselect/pkgdisplay.cc:99
-msgid "Up-to-date"
-msgstr "已更新"
+#: dselect/pkgdisplay.cc
+msgid "Installed"
+msgstr "已安裝"
 
-#: dselect/pkgdisplay.cc:100
+#: dselect/pkgdisplay.cc
 msgid "Available"
 msgstr "可用"
 
-#: dselect/pkgdisplay.cc:101 dselect/pkgdisplay.cc:117
+#: dselect/pkgdisplay.cc
 msgid "Removed"
 msgstr "已刪除"
 
-#: dselect/pkgdisplay.cc:102 dselect/pkgdisplay.cc:111
+#: dselect/pkgdisplay.cc
 msgid "Brokenly installed packages"
 msgstr "有問題的已安裝套件"
 
-#: dselect/pkgdisplay.cc:103
+#: dselect/pkgdisplay.cc
 msgid "Newly available packages"
 msgstr "新的可用套件"
 
-#: dselect/pkgdisplay.cc:104
-msgid "Updated packages (newer version is available)"
-msgstr "套件有更新版本(有更新的版本可用了)"
+#: dselect/pkgdisplay.cc
+#, fuzzy
+#| msgid "Newly available packages"
+msgid "Upgradable packages"
+msgstr "新的可用套件"
 
-#: dselect/pkgdisplay.cc:105
-msgid "Obsolete and local packages present on system"
+#: dselect/pkgdisplay.cc
+#, fuzzy
+#| msgid "Obsolete and local packages present on system"
+msgid "Obsolete and locally created packages"
 msgstr "系統中安裝這些的套件是已淘汰的和本地的"
 
-#: dselect/pkgdisplay.cc:106
-msgid "Up to date installed packages"
-msgstr "安裝了的套件版本是最新的"
+#: dselect/pkgdisplay.cc
+msgid "Installed packages"
+msgstr "已經安裝的套件"
 
-#: dselect/pkgdisplay.cc:107
-msgid "Available packages (not currently installed)"
-msgstr "可用的套件(目前沒有被安裝)"
+#: dselect/pkgdisplay.cc
+#, fuzzy
+#| msgid "Up to date installed packages"
+msgid "Available not installed packages"
+msgstr "安裝了的套件版本是最新的"
 
-#: dselect/pkgdisplay.cc:108
+#: dselect/pkgdisplay.cc
 msgid "Removed and no longer available packages"
 msgstr "被刪除而且不再可用的套件"
 
-#: dselect/pkgdisplay.cc:112
-msgid "Installed packages"
-msgstr "已經安裝的套件"
-
-#: dselect/pkgdisplay.cc:113
+#: dselect/pkgdisplay.cc
 msgid "Removed packages (configuration still present)"
 msgstr "被刪除的套件 (其設定檔案仍然存在於系統中)"
 
-#: dselect/pkgdisplay.cc:114
+#: dselect/pkgdisplay.cc
 msgid "Purged packages and those never installed"
 msgstr "被完全清除的套件以及那些從未被安裝過的套件"
 
-#: dselect/pkgdisplay.cc:116
-msgid "Installed"
-msgstr "已安裝"
-
-#: dselect/pkgdisplay.cc:118
+#: dselect/pkgdisplay.cc
 msgid "Purged"
 msgstr "已徹底移除"
 
-#: dselect/pkgdisplay.cc:138
+#: dselect/pkgdisplay.cc
 msgid "Error"
 msgstr "錯誤"
 
-#: dselect/pkgdisplay.cc:139
+#: dselect/pkgdisplay.cc
 msgid "Installed?"
 msgstr "已安裝？"
 
-#: dselect/pkgdisplay.cc:140
+#: dselect/pkgdisplay.cc
 msgid "Old mark"
 msgstr "原有標記"
 
-#: dselect/pkgdisplay.cc:141
+#: dselect/pkgdisplay.cc
 msgid "Marked for"
 msgstr "現標記為"
 
-#: dselect/pkgdisplay.cc:143
+#: dselect/pkgdisplay.cc
 msgid "EIOM"
 msgstr "EIOM"
 
-#: dselect/pkgdisplay.cc:147 dselect/pkgdisplay.cc:150
+#: dselect/pkgdisplay.cc
 msgid "Section"
 msgstr "所屬類別"
 
-#: dselect/pkgdisplay.cc:148
+#: dselect/pkgdisplay.cc
 msgid "Priority"
 msgstr "優先級"
 
-#: dselect/pkgdisplay.cc:152
+#: dselect/pkgdisplay.cc
 msgid "Package"
 msgstr "套件名"
 
-#: dselect/pkgdisplay.cc:161 dselect/pkgdisplay.cc:165
+#: dselect/pkgdisplay.cc
 #, fuzzy
 #| msgid "Avail.ver"
 msgid "Avail.arch"
 msgstr "可用版本"
 
-#: dselect/pkgdisplay.cc:164
+#: dselect/pkgdisplay.cc
 #, fuzzy
 #| msgid "Inst.ver"
 msgid "Inst.arch"
 msgstr "安裝版本"
 
-#: dselect/pkgdisplay.cc:178 dselect/pkgdisplay.cc:182
+#: dselect/pkgdisplay.cc
 msgid "Avail.ver"
 msgstr "可用版本"
 
-#: dselect/pkgdisplay.cc:181
+#: dselect/pkgdisplay.cc
 msgid "Inst.ver"
 msgstr "安裝版本"
 
-#: dselect/pkgdisplay.cc:197
+#: dselect/pkgdisplay.cc
 msgid "dselect - recursive package listing"
 msgstr "dselect - 遞迴地列出套件"
 
-#: dselect/pkgdisplay.cc:199
+#: dselect/pkgdisplay.cc
 msgid "dselect - inspection of package states"
 msgstr "dselect - 檢視套件的狀態"
 
-#: dselect/pkgdisplay.cc:200
+#: dselect/pkgdisplay.cc
 msgid "dselect - main package listing"
 msgstr "dselect - 套件主列表"
 
-#: dselect/pkgdisplay.cc:208
+#: dselect/pkgdisplay.cc
 msgid " (by section)"
 msgstr " (依類別區分)"
 
-#: dselect/pkgdisplay.cc:211
+#: dselect/pkgdisplay.cc
 msgid " (avail., section)"
 msgstr " (依是否可用和所屬類別)"
 
-#: dselect/pkgdisplay.cc:214
+#: dselect/pkgdisplay.cc
 msgid " (status, section)"
 msgstr " (依狀態和所屬類別)"
 
-#: dselect/pkgdisplay.cc:223
+#: dselect/pkgdisplay.cc
 msgid " (by priority)"
 msgstr " (依優先級)"
 
-#: dselect/pkgdisplay.cc:226
+#: dselect/pkgdisplay.cc
 msgid " (avail., priority)"
 msgstr " (依是否可用和優先級)"
 
-#: dselect/pkgdisplay.cc:229
+#: dselect/pkgdisplay.cc
 msgid " (status, priority)"
 msgstr " (依狀態和優先級)"
 
-#: dselect/pkgdisplay.cc:238
+#: dselect/pkgdisplay.cc
 msgid " (alphabetically)"
 msgstr " (依字母表順序)"
 
-#: dselect/pkgdisplay.cc:241
+#: dselect/pkgdisplay.cc
 msgid " (by availability)"
 msgstr " (依是否可用)"
 
-#: dselect/pkgdisplay.cc:244
+#: dselect/pkgdisplay.cc
 msgid " (by status)"
 msgstr " (依狀態區分)"
 
-#: dselect/pkgdisplay.cc:259
+#: dselect/pkgdisplay.cc
 msgid " mark:+/=/- terse:v help:?"
 msgstr " 標記:+/=/- 簡略:v 幫助:?"
 
-#: dselect/pkgdisplay.cc:260
+#: dselect/pkgdisplay.cc
 msgid " mark:+/=/- verbose:v help:?"
 msgstr " 標記:+/=/- 詳盡:v 幫助:?"
 
-#: dselect/pkgdisplay.cc:262
+#: dselect/pkgdisplay.cc
 msgid " terse:v help:?"
 msgstr " 簡略:v 幫助:?"
 
-#: dselect/pkgdisplay.cc:263
+#: dselect/pkgdisplay.cc
 msgid " verbose:v help:?"
 msgstr " 詳盡:v 幫助:?"
 
-#: dselect/pkginfo.cc:85
+#: dselect/pkginfo.cc
 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 "
@@ -1581,80 +1610,110 @@ msgstr ""
 "您可以按 `o' 或者 `O' 來以不同的規則排序，這樣您就能在不同類型的套件作\n"
 "標記了。"
 
-#: dselect/pkginfo.cc:98
+#: dselect/pkginfo.cc
 msgid "Interrelationships"
 msgstr "相互關系"
 
-#: dselect/pkginfo.cc:117
+#: dselect/pkginfo.cc
 msgid "No description available."
 msgstr "無相關介紹。"
 
-#: dselect/pkginfo.cc:135
+#: dselect/pkginfo.cc
 msgid "Installed control file information"
 msgstr "已安裝的控制檔案訊息"
 
-#: dselect/pkginfo.cc:151
+#: dselect/pkginfo.cc
 msgid "Available control file information"
 msgstr "可用的控制檔案訊息"
 
-#: dselect/pkglist.cc:425
+#: dselect/pkglist.cc
 msgid "there are no packages"
 msgstr "沒有多餘的套件"
 
-#: dselect/pkglist.cc:521
+#: dselect/pkglist.cc
 msgid "invalid search option given"
 msgstr "指定了無效的搜尋選項"
 
-#: dselect/pkglist.cc:536
+#: dselect/pkglist.cc
 msgid "error in regular expression"
 msgstr "正規表示法有誤"
 
-#: dselect/pkgsublist.cc:111
+#: dselect/pkgsublist.cc
 msgid " does not appear to be available\n"
 msgstr " 看上去應該不可用\n"
 
-#: dselect/pkgsublist.cc:131
+#: dselect/pkgsublist.cc
 msgid " or "
 msgstr " 或者 "
 
-#: dselect/pkgtop.cc:58
+#: dselect/pkgtop.cc
 msgid "All"
 msgstr "所有"
 
-#: dselect/pkgtop.cc:80
+#: dselect/pkgtop.cc
 msgid "All packages"
 msgstr "所有套件"
 
-#: dselect/pkgtop.cc:84
+#: dselect/pkgtop.cc
 #, c-format
 msgid "%s packages without a section"
 msgstr "不指定類別 %s 套件"
 
-#: dselect/pkgtop.cc:86
+#: dselect/pkgtop.cc
 #, c-format
 msgid "%s packages in section %s"
 msgstr "在 %2$s 類別中 %1$s 套件"
 
-#: dselect/pkgtop.cc:92
+#: dselect/pkgtop.cc
 #, c-format
 msgid "%s %s packages"
 msgstr "%s %s 套件"
 
-#: dselect/pkgtop.cc:96
+#: dselect/pkgtop.cc
 #, c-format
 msgid "%s %s packages without a section"
 msgstr "不指定類別 %s %s 套件"
 
-#: dselect/pkgtop.cc:98
+#: dselect/pkgtop.cc
 #, c-format
 msgid "%s %s packages in section %s"
 msgstr "在 %3$s 類別中 %1$s %2$s 套件"
 
-#: dselect/pkgtop.cc:119
+#: dselect/pkgtop.cc
 #, c-format
 msgid "%-*s %s%s%s;  %s (was: %s).  %s"
 msgstr "%-*s %s%s%s;  %s (曾為：%s).  %s"
 
+#~ msgid "Actions:\n"
+#~ msgstr "動作：\n"
+
+#~ msgid "Colours:\n"
+#~ msgstr "顏色：\n"
+
+#~ msgid "Attributes:\n"
+#~ msgstr "屬性：\n"
+
+#~ msgid "EOF before option name start"
+#~ msgstr "在選項名開始前就發現了 EOF"
+
+#~ msgid "EOF before summary"
+#~ msgstr "在概述前發現了 EOF"
+
+#~ msgid "!Bug!"
+#~ msgstr "!臭蟲!"
+
+#~ msgid "Updated"
+#~ msgstr "有更新"
+
+#~ msgid "Up-to-date"
+#~ msgstr "已更新"
+
+#~ msgid "Updated packages (newer version is available)"
+#~ msgstr "套件有更新版本(有更新的版本可用了)"
+
+#~ msgid "Available packages (not currently installed)"
+#~ msgstr "可用的套件(目前沒有被安裝)"
+
 #~ msgid "foreign architectures enabled but multi-arch is not supported"
 #~ msgstr "外部平台啟動但是多平台不支援"