Cleanup and unify program usage and version output, make it more i18n

friendly. Fix wrong gettext usage with interparsed macros.
Thanks to Changwoo Ryu for noticing. Closes: #23791

1 files changed, 299 insertions, 251 deletions

diff --git a/po/da.po b/po/da.po
index ad2eeac19..866fe36b5 100644
--- a/po/da.po
+++ b/po/da.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dpkg_1.10.19_da\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2006-01-23 19:31+0100\n"
+"POT-Creation-Date: 2006-02-06 23:10+0200\n"
 "PO-Revision-Date: 2006-01-17 20:16+0100\n"
 "Last-Translator: Claus Hindsgaul <claus_h@image.dk>\n"
 "Language-Team: Danish <dansk@klid.dk>\n"
@@ -2117,90 +2117,89 @@ msgid "failed to exec rm for cleanup"
 msgstr "kunne ikke udføre 'rm' for oprydning"
 
 #: src/main.c:44
-msgid "Debian GNU/Linux `"
-msgstr "Debian GNU/Linux '"
-
-#: src/main.c:46
-msgid "' package management program version "
+#, fuzzy, c-format
+msgid "Debian `%s' package management program version %s.\n"
 msgstr "' forespørgselsværktøj til pakkehåndteringen version "
 
-#: src/main.c:48 src/query.c:463
+#: src/main.c:46 src/query.c:461 dselect/main.cc:157 dpkg-deb/main.c:48
+#: dpkg-split/main.c:41
+#, fuzzy, c-format
 msgid ""
-"This is free software; see the GNU General Public Licence version 2 or\n"
-"later for copying conditions.  There is NO warranty.\n"
-"See "
+"This is free software; see the GNU General Public License version 2 or\n"
+"later for copying conditions. There is NO warranty.\n"
+"See %s --license for copyright and license details.\n"
 msgstr ""
 "Dette er frit programmel; se \"GNU General Public Licence\" version 2 eller\n"
-"senere for kopieringsbetingelser. Der er INGEN garanti.\n"
-"Se "
-
-#: src/main.c:50 src/query.c:465
-msgid " --licence for copyright and license details.\n"
-msgstr "--licence for detaljer om ophavsret og licens.\n"
+"senere for forhold vedrørende ophavsret. Der er INGEN garanti.\n"
+"Se dpkg-deb --licence for detaljerne.\n"
 
-#: src/main.c:58
-#, c-format
+#: src/main.c:57
+#, fuzzy, c-format
 msgid ""
-"Usage: \n"
-"  dpkg -i|--install      <.deb file name> ... | -R|--recursive <dir> ...\n"
-"  dpkg --unpack          <.deb file name> ... | -R|--recursive <dir> ...\n"
-"  dpkg -A|--record-avail <.deb file name> ... | -R|--recursive <dir> ...\n"
-"  dpkg --configure              <package name> ... | -a|--pending\n"
-"  dpkg -r|--remove | -P|--purge <package name> ... | -a|--pending\n"
-"  dpkg --get-selections [<pattern> ...]    get list of selections to stdout\n"
-"  dpkg --set-selections                    set package selections from "
-"stdin\n"
-"  dpkg --update-avail <Packages-file>      replace available packages info\n"
-"  dpkg --merge-avail <Packages-file>       merge with info from file\n"
-"  dpkg --clear-avail                       erase existing available info\n"
-"  dpkg --forget-old-unavail                forget uninstalled unavailable "
-"pkgs\n"
-"  dpkg -s|--status <package-name> ...      display package status details\n"
-"  dpkg -p|--print-avail <package-name> ... display available version "
-"details\n"
-"  dpkg -L|--listfiles <package-name> ...   list files `owned' by package(s)\n"
-"  dpkg -l|--list [<pattern> ...]           list packages concisely\n"
-"  dpkg -S|--search <pattern> ...           find package(s) owning file(s)\n"
-"  dpkg -C|--audit                          check for broken package(s)\n"
-"  dpkg --print-architecture                print dpkg architecture\n"
-"  dpkg --compare-versions <a> <rel> <b>    compare version numbers - see "
-"below\n"
-"  dpkg --help | --version                  show this help / version number\n"
-"  dpkg --force-help | -Dh|--debug=help     help on forcing resp. debugging\n"
-"  dpkg --licence                           print copyright licensing terms\n"
+"Usage: %s [<option> ...] <command>\n"
+"\n"
+"Commands:\n"
+"  -i|--install       <.deb file name> ... | -R|--recursive <dir> ...\n"
+"  --unpack           <.deb file name> ... | -R|--recursive <dir> ...\n"
+"  -A|--record-avail  <.deb file name> ... | -R|--recursive <dir> ...\n"
+"  --configure        <package-name> ... | -a|--pending\n"
+"  -r|--remove        <package-name> ... | -a|--pending\n"
+"  -P|--purge         <package-name> ... | -a|--pending\n"
+"  --get-selections [<pattern> ...]     Get list of selections to stdout.\n"
+"  --set-selections                     Set package selections from stdin.\n"
+"  --update-avail <Packages-file>       Replace available packages info.\n"
+"  --merge-avail <Packages-file>        Merge with info from file.\n"
+"  --clear-avail                        Erase existing available info.\n"
+"  --forget-old-unavail                 Forget uninstalled unavailable pkgs.\n"
+"  -s|--status <package-name> ...       Display package status details.\n"
+"  -p|--print-avail <package-name> ...  Display available version details.\n"
+"  -L|--listfiles <package-name> ...    List files `owned' by package(s).\n"
+"  -l|--list [<pattern> ...]            List packages concisely.\n"
+"  -S|--search <pattern> ...            Find package(s) owning file(s).\n"
+"  -C|--audit                           Check for broken package(s).\n"
+"  --print-architecture                 Print dpkg architecture.\n"
+"  --compare-versions <a> <rel> <b>     Compare version numbers - see below.\n"
+"  --help                               Show this help message.\n"
+"  --version                            Show the version.\n"
+"  --force-help | -Dh|--debug=help      Help on forcing resp. debugging.\n"
+"  --license | --licence                Print copyright licensing terms.\n"
 "\n"
 "Use dpkg -b|--build|-c|--contents|-e|--control|-I|--info|-f|--field|\n"
-" -x|--extract|-X|--vextract|--fsys-tarfile  on archives (type %s --help.)\n"
+" -x|--extract|-X|--vextract|--fsys-tarfile  on archives (type %s --help).\n"
 "\n"
 "For internal use: dpkg --assert-support-predepends | --predep-package |\n"
-"  --assert-working-epoch | --assert-long-filenames | --assert-multi-conrep\n"
+"  --assert-working-epoch | --assert-long-filenames | --assert-multi-conrep.\n"
 "\n"
 "Options:\n"
-"  --admindir=<directory>     Use <directory> instead of %s\n"
-"  --root=<directory>         Install on alternative system rooted elsewhere\n"
-"  --instdir=<directory>      Change inst'n root without changing admin dir\n"
-"  -O|--selected-only         Skip packages not selected for install/upgrade\n"
-"  -E|--skip-same-version     Skip packages whose same version is installed\n"
+"  --admindir=<directory>     Use <directory> instead of %s.\n"
+"  --root=<directory>         Install on alternative system rooted "
+"elsewhere.\n"
+"  --instdir=<directory>      Change inst'n root without changing admin dir.\n"
+"  -O|--selected-only         Skip packages not selected for install/"
+"upgrade.\n"
+"  -E|--skip-same-version     Skip packages whose same version is installed.\n"
 "  -G|--refuse-downgrade      Skip packages with earlier version than "
-"installed\n"
+"installed.\n"
 "  -B|--auto-deconfigure      Install even if it would break some other "
-"package\n"
-"  --no-debsig                Do not try to verify package signatures\n"
+"package.\n"
+"  --no-debsig                Do not try to verify package signatures.\n"
 "  --no-act|--dry-run|--simulate\n"
-"                             Just say what we would do - don't do it\n"
-"  -D|--debug=<octal>         Enable debugging - see -Dhelp or --debug=help\n"
+"                             Just say what we would do - don't do it.\n"
+"  -D|--debug=<octal>         Enable debugging - see -Dhelp or --debug=help.\n"
 "  --status-fd <n>            Send status change updates to file descriptor "
-"<n>\n"
-"  --log=<filename>           Log status changes and actions to <filename>\n"
-"  --ignore-depends=<package>,... Ignore dependencies involving <package>\n"
-"  --force-...                    Override problems - see --force-help\n"
-"  --no-force-...|--refuse-...    Stop when problems encountered\n"
-"  --abort-after <n>              Abort after encountering <n> errors\n"
+"<n>.\n"
+"  --log=<filename>           Log status changes and actions to <filename>.\n"
+"  --ignore-depends=<package>,... Ignore dependencies involving <package>.\n"
+"  --force-...                    Override problems - see --force-help.\n"
+"  --no-force-...|--refuse-...    Stop when problems encountered.\n"
+"  --abort-after <n>              Abort after encountering <n> errors.\n"
 "\n"
 "Comparison operators for --compare-versions are:\n"
-" lt le eq ne ge gt       (treat empty version as earlier than any version);\n"
-" lt-nl le-nl ge-nl gt-nl (treat empty version as later than any version);\n"
-" < << <= = >= >> >       (only for compatibility with control file syntax).\n"
+"  lt le eq ne ge gt       (treat empty version as earlier than any "
+"version);\n"
+"  lt-nl le-nl ge-nl gt-nl (treat empty version as later than any version);\n"
+"  < << <= = >= >> >       (only for compatibility with control file "
+"syntax).\n"
 "\n"
 "Use `dselect' or `aptitude' for user-friendly package management.\n"
 msgstr ""
@@ -2281,14 +2280,15 @@ msgstr ""
 "\n"
 "Brug 'dselect' eller 'aptitude' for en mere brugervenlig pakkehåndtering.\n"
 
-#: src/main.c:119
+#: src/main.c:121
+#, fuzzy
 msgid ""
 "Type dpkg --help for help about installing and deinstalling packages [*];\n"
 "Use `dselect' or `aptitude' for user-friendly package management;\n"
 "Type dpkg -Dhelp for a list of dpkg debug flag values;\n"
 "Type dpkg --force-help for a list of forcing options;\n"
 "Type dpkg-deb --help for help about manipulating *.deb files;\n"
-"Type dpkg --licence for copyright licence and lack of warranty (GNU GPL) "
+"Type dpkg --license for copyright license and lack of warranty (GNU GPL) "
 "[*].\n"
 "\n"
 "Options marked [*] produce a lot of output - pipe it through `less' or "
@@ -2307,17 +2307,17 @@ msgstr ""
 "Tilvalg markeret med [*] giver mange uddata - led dem gennem 'less' eller "
 "'more'!"
 
-#: src/main.c:184 src/query.c:531 dpkg-deb/main.c:162 dpkg-split/main.c:145
+#: src/main.c:186 src/query.c:531 dpkg-deb/main.c:167 dpkg-split/main.c:151
 #, c-format
 msgid "conflicting actions --%s and --%s"
 msgstr "modstridende handlinger --%s og --%s"
 
-#: src/main.c:189
+#: src/main.c:191
 #, c-format
 msgid "Warning: obsolete option `--%s'\n"
 msgstr "Advarsel: forældet tilvalg '--%s'\n"
 
-#: src/main.c:197
+#: src/main.c:199
 #, c-format
 msgid ""
 "%s debugging option, --debug=<octal> or -D<octal>:\n"
@@ -2355,26 +2355,26 @@ msgstr ""
 "Aflusningstilvalg kan blandes med logisk og.\n"
 "Bemærk, at betydningerne og værdierne kan blive ændret fremover.\n"
 
-#: src/main.c:216
+#: src/main.c:218
 msgid "--debug requires an octal argument"
 msgstr "--debug kræver et oktalt parameter"
 
-#: src/main.c:240
+#: src/main.c:242
 #, c-format
 msgid "null package name in --ignore-depends comma-separated list `%.250s'"
 msgstr "tomt pakkenavn i --ignore-depends kommasepareret liste '%.250s'"
 
-#: src/main.c:246
+#: src/main.c:248
 #, c-format
 msgid "--ignore-depends requires a legal package name. `%.250s' is not; %s"
 msgstr "--ignore-depends kræver et gyldigt pakkenavn. Det er '%.250s' ikke; %s"
 
-#: src/main.c:262 src/main.c:273
+#: src/main.c:264 src/main.c:275
 #, c-format
 msgid "invalid integer for --%s: `%.250s'"
 msgstr "ugyldigt heltal for --%s: '%.250s'"
 
-#: src/main.c:292
+#: src/main.c:294
 #, c-format
 msgid ""
 "%s forcing options - control behaviour when problems found:\n"
@@ -2456,48 +2456,48 @@ msgstr ""
 "alvorligt.\n"
 "Gennemtvingsningstilvalg mærket [*] er aktiveret som standard.\n"
 
-#: src/main.c:337
+#: src/main.c:339
 #, c-format
 msgid "unknown force/refuse option `%.*s'"
 msgstr "ukendt gennemtvingnings/afvisnings-tilvalg '%.*s'"
 
-#: src/main.c:442 src/main.c:446
+#: src/main.c:444 src/main.c:448
 msgid "couldn't malloc in execbackend"
 msgstr "kunne ikke udføre 'malloc' i execbackend"
 
-#: src/main.c:444 src/main.c:451
+#: src/main.c:446 src/main.c:453
 msgid "couldn't strdup in execbackend"
 msgstr "kunne ikke udføre 'strdup' i execbackend"
 
-#: src/main.c:455
+#: src/main.c:457
 #, c-format
 msgid "failed to exec %s"
 msgstr "kunne ikke eksekvere %s"
 
-#: src/main.c:467
+#: src/main.c:469
 msgid "--command-fd takes 1 argument, not 0"
 msgstr "--command-fd tager 1 parameter, ikke 0"
 
-#: src/main.c:468
+#: src/main.c:470
 msgid "--command-fd only takes 1 argument"
 msgstr "--command-fd tager kun 1 parameter"
 
-#: src/main.c:470
+#: src/main.c:472
 msgid "invalid number for --command-fd"
 msgstr "ugyldigt tal for  --command-fd"
 
-#: src/main.c:472
+#: src/main.c:474
 #, c-format
 msgid "couldn't open `%i' for stream"
 msgstr "kunne ikke åbne '%i' for strøm"
 
-#: src/main.c:497
+#: src/main.c:499
 #, c-format
 msgid "unexpected eof before end of line %d"
 msgstr "uventet slut-på-fil før afslutningen af linje %d"
 
-#: src/main.c:541 src/main.c:556 src/query.c:566 dpkg-deb/main.c:184
-#: dpkg-split/main.c:157
+#: src/main.c:543 src/main.c:558 src/query.c:566 dpkg-deb/main.c:189
+#: dpkg-split/main.c:163
 msgid "need an action option"
 msgstr "kræver et handlings-tilvalg"
 
@@ -2887,46 +2887,31 @@ msgstr ""
 "Brug dpkg --info (= dpkg-deb --info) til at undersøge arkivfiler,\n"
 "og dpkg --contents (= dpkg-deb --contents) til at vise deres indhold.\n"
 
-#: src/query.c:459 dpkg-deb/main.c:46
-msgid "Debian `"
-msgstr "Debian '"
-
-#: src/query.c:461
-msgid "' package management program query tool\n"
+#: src/query.c:459
+#, fuzzy, c-format
+msgid "Debian `%s' package management program query tool\n"
 msgstr "' pakkehåndteringsprogram\n"
 
-#: src/query.c:473
-#, c-format
-msgid "Usage: "
-msgstr "Brug: "
-
-#: src/query.c:474
-#, c-format
+#: src/query.c:472
+#, fuzzy, c-format
 msgid ""
-" [<option>] <command>\n"
+"Usage: %s [<option> ...] <command>\n"
+"\n"
 "Commands:\n"
-"  -s|--status <package-name> ...      display package status details\n"
-"  -p|--print-avail <package-name> ... display available version details\n"
-"  -L|--listfiles <package-name> ...   list files `owned' by package(s)\n"
-"  -l|--list [<pattern> ...]           list packages concisely\n"
-"  -W|--show <pattern> ...             show information on package(s)\n"
-"  -S|--search <pattern> ...           find package(s) owning file(s)\n"
-"  --help | --version                  show this help / version number\n"
-"  --licence                           print copyright licensing terms\n"
+"  -s|--status <package-name> ...      Display package status details.\n"
+"  -p|--print-avail <package-name> ... Display available version details.\n"
+"  -L|--listfiles <package-name> ...   List files `owned' by package(s).\n"
+"  -l|--list [<pattern> ...]           List packages concisely.\n"
+"  -W|--show <pattern> ...             Show information on package(s).\n"
+"  -S|--search <pattern> ...           Find package(s) owning file(s).\n"
+"  --help                              Show this help message.\n"
+"  --version                           Show the version.\n"
+"  --license | --licence               Show the copyright licensing terms.\n"
 "\n"
 "Options:\n"
-"  --admindir=<directory>     Use <directory> instead of %s\n"
-"  -f|--showformat=<format>   Use alternative format for --show\n"
+"  --admindir=<directory>              Use <directory> instead of %s.\n"
+"  -f|--showformat=<format>            Use alternative format for --show.\n"
 "\n"
-"Format syntax:\n"
-"  A format is a string that will be output for each package. The format\n"
-"  can include the standard escape sequences \\n (newline), \\r (carriage\n"
-"  return) or \\\\ (plain backslash). Package information can be included\n"
-"  by inserting variable references to package fields using the ${var[;"
-"width]}\n"
-"  syntax. Fields will be right-aligned unless the width is negative in "
-"which\n"
-"   case left aligenment will be used. \n"
 msgstr ""
 " [<tilvalg>] <kommando>\n"
 "Kommandoer:\n"
@@ -2951,10 +2936,25 @@ msgstr ""
 "  ${var[;bredde]}. Felter vil være højrejusterede medmindre bredden er    "
 "negativ. I så fald vil de være venstrejusterede.\n"
 
+#: src/query.c:491 dpkg-deb/main.c:87
+#, c-format
+msgid ""
+"Format syntax:\n"
+"  A format is a string that will be output for each package. The format\n"
+"  can include the standard escape sequences \\n (newline), \\r (carriage\n"
+"  return) or \\\\ (plain backslash). Package information can be included\n"
+"  by inserting variable references to package fields using the ${var[;"
+"width]}\n"
+"  syntax. Fields will be right-aligned unless the width is negative in "
+"which\n"
+"  case left alignment will be used.\n"
+msgstr ""
+
 #: src/query.c:501
+#, fuzzy
 msgid ""
 "Use --help for help about querying packages;\n"
-"Use --licence for copyright licence and lack of warranty (GNU GPL).\n"
+"Use --license for copyright license and lack of warranty (GNU GPL).\n"
 "\n"
 msgstr ""
 "Brug --help for hjælp om at forespørge pakker;\n"
@@ -3990,106 +3990,99 @@ msgid "menu"
 msgstr "menu"
 
 #: dselect/main.cc:150
-#, c-format
-msgid "Debian `%s' package handling frontend."
+#, fuzzy, c-format
+msgid "Debian `%s' package handling frontend version %s.\n"
 msgstr "Debian '%s' pakkehåndtering."
 
 #: dselect/main.cc:153
-#, c-format
 msgid ""
-"Version %s.\n"
 "Copyright (C) 1994-1996 Ian Jackson.\n"
 "Copyright (C) 2000,2001 Wichert Akkerman.\n"
-"This is free software; see the GNU General Public Licence version 2\n"
-"or later for copying conditions.  There is NO warranty.  See\n"
-"dselect --licence for details.\n"
 msgstr ""
-"Version %s.\n"
-"Copyright (C) 1994-1996 Ian Jackson.\n"
-"Copyright (C) 2000,2001 Wichert Akkerman.\n"
-"\n"
-"Dette er frit programmel; se GNU General Public Licence version 2\n"
-"eller senere for forhold vedrørende kopiering. Der er INGEN garanti. Se\n"
-"\"dselect --licence\" for detaljer.\n"
 
-#: dselect/main.cc:169
+#: dselect/main.cc:171
+#, c-format
 msgid ""
-"Usage: dselect [options]\n"
-"       dselect [options] action ...\n"
-"Options:  --admindir <directory>  (default is /var/lib/dpkg)\n"
-"          --help  --version  --licence  --expert  --debug <file> | -D<file>\n"
-"          --colour screenpart:[foreground],[background][:attr[+attr+..]]\n"
-"Actions:  access update select install config remove quit\n"
-msgstr ""
-"Brug: dselect [tilvalg]\n"
-"      dselect [tilvalg] handling ...\n"
-"Tilvalg:  --admindir <mappe>  (standard: /var/lib/dpkg)\n"
-"          --help  --version  --licence  --expert  --debug <fil> | -D<fil>\n"
-"          --colour skærmområde:[forgrund],[baggrund][:attr[+attr+..]]"
-"Handlinger:  access update select install config remove quit\n"
-
-#: dselect/main.cc:177
+"Usage: %s [<option> ...] [<action> ...]\n"
+"\n"
+"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"
+"  --help                     Show this help message.\n"
+"  --version                  Show the version.\n"
+"  --license                  Show the license.\n"
+"\n"
+"Actions:\n"
+"  access update select install config remove quit\n"
+"\n"
+msgstr ""
+
+#: dselect/main.cc:187
 #, c-format
 msgid "Screenparts:\n"
 msgstr "Skærmområder:\n"
 
-#: dselect/main.cc:182
+#: dselect/main.cc:192
 #, c-format
 msgid "Colours:\n"
 msgstr "Farver:\n"
 
-#: dselect/main.cc:187
+#: dselect/main.cc:197
 #, c-format
 msgid "Attributes:\n"
 msgstr "Egenskaber:\n"
 
-#: dselect/main.cc:207
+#: dselect/main.cc:217
 #, c-format
 msgid "couldn't open debug file `%.255s'\n"
 msgstr "kunne ikke åbne aflusningsfil '%.255s'\n"
 
-#: dselect/main.cc:222
+#: dselect/main.cc:232
 #, c-format
 msgid "Invalid %s `%s'\n"
 msgstr "Ugyldig %s '%s'\n"
 
-#: dselect/main.cc:239
+#: dselect/main.cc:249
 msgid "screen part"
 msgstr "skærmområde"
 
-#: dselect/main.cc:245
+#: dselect/main.cc:255
 msgid "Null colour specification\n"
 msgstr "Nulfarveangivelse\n"
 
-#: dselect/main.cc:253 dselect/main.cc:258
+#: dselect/main.cc:263 dselect/main.cc:268
 msgid "colour"
 msgstr "farve"
 
-#: dselect/main.cc:266
+#: dselect/main.cc:276
 msgid "colour attribute"
 msgstr "farveegenskab"
 
-#: dselect/main.cc:300
+#: dselect/main.cc:310
 msgid "Terminal does not appear to support cursor addressing.\n"
 msgstr "Terminalen lader ikke til at understøtte makøradressering.\n"
 
-#: dselect/main.cc:302
+#: dselect/main.cc:312
 msgid "Terminal does not appear to support highlighting.\n"
 msgstr "Terminalen lader ikke til at understøtte fremhævning.\n"
 
-#: dselect/main.cc:303
+#: dselect/main.cc:314
+#, fuzzy, c-format
 msgid ""
 "Set your TERM variable correctly, use a better terminal,\n"
-"or make do with the per-package management tool "
+"or make do with the per-package management tool %s.\n"
 msgstr ""
 "Sæt din TERM-variabel korrekt, brug en bedre terminal\n"
 "eller klar dig med enkeltpakke-håndteringsværktøjerne "
 
-#: dselect/main.cc:306
+#: dselect/main.cc:317
 msgid "terminal lacks necessary features, giving up"
 msgstr "teminalen mangler nødvendige funktioner. Giver op"
 
-#: dselect/main.cc:384
+#: dselect/main.cc:395
 msgid ""
 "\n"
 "\n"
@@ -4103,7 +4096,7 @@ msgstr ""
 "Tryk <retur> for at bekræfte valg.  ^L gentegner skærmen.\n"
 "\n"
 
-#: dselect/main.cc:398
+#: dselect/main.cc:410
 msgid ""
 "\n"
 "\n"
@@ -4113,11 +4106,11 @@ msgstr ""
 "\n"
 "Skrivebeskyttet adgang: kun visning af valg er tilgængelig!"
 
-#: dselect/main.cc:417
+#: dselect/main.cc:429
 msgid "failed to getch in main menu"
 msgstr "kunne ikke udføre 'getch' i hovedmenu"
 
-#: dselect/main.cc:490
+#: dselect/main.cc:502
 #, c-format
 msgid "unknown action string `%.50s'"
 msgstr "ukendt handlingsstreng '%.50s'"
@@ -5342,62 +5335,44 @@ msgstr "Fejl i format"
 msgid "--contents takes exactly one argument"
 msgstr "--contents tager nøjagtig ét parameter"
 
-#: dpkg-deb/main.c:48
-msgid "' package archive backend version "
+#: dpkg-deb/main.c:46
+#, fuzzy, c-format
+msgid "Debian `%s' package archive backend version %s.\n"
 msgstr "' pakkearkivhåndtering version"
 
-#: dpkg-deb/main.c:50
-msgid ""
-"This is free software; see the GNU General Public Licence version 2 or\n"
-"later for copying conditions. There is NO warranty.\n"
-"See dpkg-deb --licence for details.\n"
-msgstr ""
-"Dette er frit programmel; se \"GNU General Public Licence\" version 2 eller\n"
-"senere for forhold vedrørende ophavsret. Der er INGEN garanti.\n"
-"Se dpkg-deb --licence for detaljerne.\n"
-
-#: dpkg-deb/main.c:58
+#: dpkg-deb/main.c:56
+#, fuzzy, c-format
 msgid ""
-"Command:\n"
-"  -b|--build <directory> [<deb>]    build an archive.\n"
-"  -c|--contents <deb>               list contents.\n"
-"  -I|--info <deb> [<cfile>...]      show info to stdout.\n"
-"  -W|--show <deb>                   show information on package(s)\n"
-"  -f|--field <deb> [<cfield>...]    show field(s) to stdout.\n"
-"  -e|--control <deb> [<directory>]  extract control info.\n"
-"  -x|--extract <deb> <directory>    extract files.\n"
-"  -X|--vextract <deb> <directory>   extract & list files.\n"
-"  --fsys-tarfile <deb>              output filesystem tarfile.\n"
-"  -h|--help                         display this message.\n"
-"  --version | --licence             show version/licence.\n"
+"Usage: %s [<option> ...] <command>\n"
+"\n"
+"Commands:\n"
+"  -b|--build <directory> [<deb>]    Build an archive.\n"
+"  -c|--contents <deb>               List contents.\n"
+"  -I|--info <deb> [<cfile>...]      Show info to stdout.\n"
+"  -W|--show <deb>                   Show information on package(s)\n"
+"  -f|--field <deb> [<cfield>...]    Show field(s) to stdout.\n"
+"  -e|--control <deb> [<directory>]  Extract control info.\n"
+"  -x|--extract <deb> <directory>    Extract files.\n"
+"  -X|--vextract <deb> <directory>   Extract & list files.\n"
+"  --fsys-tarfile <deb>              Output filesystem tarfile.\n"
+"  -h|--help                         Display this message.\n"
+"  --version                         Show version.\n"
+"  --license | --licence             Show license.\n"
 "\n"
 "<deb> is the filename of a Debian format archive.\n"
 "<cfile> is the name of an administrative file component.\n"
 "<cfield> is the name of a field in the main `control' file.\n"
 "\n"
 "Options:\n"
-"  --showformat=<format>      use alternative format for --show\n"
-"  -D                         enable debugging output\n"
-"  --old, --new               select archive format\n"
-"  --nocheck                  suppress control file check (build bad "
+"  --showformat=<format>      Use alternative format for --show.\n"
+"  -D                         Enable debugging output.\n"
+"  --old, --new               Select archive format.\n"
+"  --nocheck                  Suppress control file check (build bad "
 "package).\n"
-"  -z# to set the compression when building\n"
-"  -Z<type>                   set the compression type to use when building.\n"
-"                             allowed values: gzip, bzip2, none\n"
+"  -z#                        Set the compression level when building.\n"
+"  -Z<type>                   Set the compression type to use when building.\n"
+"                             Allowed values: gzip, bzip2, none.\n"
 "\n"
-"Format syntax:\n"
-"  A format is a string that will be output for each package. The format\n"
-"  can include the standard escape sequences \\n (newline), \\r (carriage\n"
-"  return) or \\\\ (plain backslash). Package information can be included\n"
-"  by inserting variable references to package fields using the ${var[;"
-"width]}\n"
-"  syntax. Fields will be right-aligned unless the width is negative in "
-"which\n"
-"   case left alignment will be used. \n"
-"\n"
-"Use `dpkg' to install and remove packages from your system, or\n"
-"`dselect' or `aptitude' for user-friendly package management.  Packages\n"
-"unpacked using `dpkg-deb --extract' will be incorrectly installed !\n"
 msgstr ""
 "Kommando:\n"
 "  -b|--build <mappe> [<deb>]        Opbyg et arkiv.\n"
@@ -5439,7 +5414,16 @@ msgstr ""
 "'dselect' eller 'aptitude' for en brugervenlig pakkehåndtering. Pakker "
 "udpakket med 'dpkg-deb --extract' vil blive ukorrekt installeret!\n"
 
-#: dpkg-deb/main.c:100
+#: dpkg-deb/main.c:96
+#, c-format
+msgid ""
+"\n"
+"Use `dpkg' to install and remove packages from your system, or\n"
+"`dselect' or `aptitude' for user-friendly package management.  Packages\n"
+"unpacked using `dpkg-deb --extract' will be incorrectly installed !\n"
+msgstr ""
+
+#: dpkg-deb/main.c:105
 msgid ""
 "Type dpkg-deb --help for help about manipulating *.deb files;\n"
 "Type dpkg --help for help about installing and deinstalling packages."
@@ -5447,7 +5431,7 @@ msgstr ""
 "Skriv 'dpkg-deb --help' for hjælp med manipulation med *.deb-filer\n"
 "Skriv 'dpkg --help' for hjælp med installation og afinstallation af pakker."
 
-#: dpkg-deb/main.c:176
+#: dpkg-deb/main.c:181
 #, c-format
 msgid "unknown compression type `%s'!"
 msgstr "ukendt komprimeringstype `%s'!"
@@ -5613,42 +5597,41 @@ msgstr "--join kræver ét eller flere delfil-parametre"
 msgid "part %d is missing"
 msgstr "del %d mangler"
 
-#: dpkg-split/main.c:39
-msgid "Debian GNU/Linux `dpkg-split' package split/join tool; version "
+#: dpkg-split/main.c:38
+#, fuzzy, c-format
+msgid "Debian `%s' package split/join tool; version %s.\n"
 msgstr ""
 "Debian GNU/Linux 'dpkg-split' pakkeopdeling/sammenføjningsværktøj; version "
 
-#: dpkg-split/main.c:41
-msgid ""
-"Copyright (C) 1994-1996 Ian Jackson.  This is free software; see the\n"
-"GNU General Public Licence version 2 or later for copying conditions.\n"
-"There is NO warranty.  See dpkg-split --licence for details.\n"
+#: dpkg-split/main.c:40
+#, c-format
+msgid "Copyright (C) 1994-1996 Ian Jackson.\n"
 msgstr ""
-"Copyright (C) 1994-1996 Ian Jackson.  Dette er frit programmel. Se\n"
-"GNU General Public Licence version 2 eller senere for forhold vedrørende\n"
-"kopiering. Der er INGEN garanti.  Se 'dpkg-split --licence' for detaljerne.\n"
 
-#: dpkg-split/main.c:48
-#, c-format
+#: dpkg-split/main.c:49
+#, fuzzy, c-format
 msgid ""
-"Usage: dpkg-split -s|--split <file> [<prefix>]     Split an archive.\n"
-"       dpkg-split -j|--join <part> <part> ...      Join parts together.\n"
-"       dpkg-split -I|--info <part> ...             Display info about a "
-"part.\n"
-"       dpkg-split -h|--help|--version|--licence    Show help/version/"
-"licence.\n"
-"\n"
-"       dpkg-split -a|--auto -o <complete> <part>   Auto-accumulate parts.\n"
-"       dpkg-split -l|--listq                       List unmatched pieces.\n"
-"       dpkg-split -d|--discard [<filename> ...]    Discard unmatched "
-"pieces.\n"
-"\n"
-"Options:  --depotdir <directory>  (default is %s/%s)\n"
-"          -S|--partsize <size>    (in Kb, for -s, default is 450)\n"
-"          -o|--output <file>      (for -j, default is <package>-<version>."
-"deb)\n"
-"          -Q|--npquiet            (be quiet when -a is not a part)\n"
-"          --msdos                 (generate 8.3 filenames)\n"
+"Usage: %s [<option> ...] <command>\n"
+"\n"
+"Commands:\n"
+"  -s|--split <file> [<prefix>]    Split an archive.\n"
+"  -j|--join <part> <part> ...     Join parts together.\n"
+"  -I|--info <part> ...            Display info about a part.\n"
+"  -h|--help                       Show this help message.\n"
+"  --version                       Show the version.\n"
+"  --license                       Show the license.\n"
+"\n"
+"  -a|--auto -o <complete> <part>  Auto-accumulate parts.\n"
+"  -l|--listq                      List unmatched pieces.\n"
+"  -d|--discard [<filename> ...]   Discard unmatched pieces.\n"
+"\n"
+"Options:\n"
+"  --depotdir <directory>          Use <directory> instead of %s/%s.\n"
+"  -S|--partsize <size>            In KiB, for -s (default is 450).\n"
+"  -o|--output <file>              For -j (default is <package>-<version>."
+"deb).\n"
+"  -Q|--npquiet                    Be quiet when -a is not a part.\n"
+"  --msdos                         Generate 8.3 filenames.\n"
 "\n"
 "Exit status: 0 = OK;  1 = -a is not a part;  2 = trouble!\n"
 msgstr ""
@@ -5674,30 +5657,30 @@ msgstr ""
 "\n"
 "Afslutningsstatus: 0 = o.k.;  1 = -a er ikke en del;  2 = problemer!\n"
 
-#: dpkg-split/main.c:69
+#: dpkg-split/main.c:75
 msgid "Type dpkg-split --help for help."
 msgstr "Skriv \"dpkg-split --help\" for hjælp."
 
-#: dpkg-split/main.c:79
+#: dpkg-split/main.c:85
 #, c-format
 msgid "error reading %s"
 msgstr "fejl ved læsning af %s"
 
-#: dpkg-split/main.c:83
+#: dpkg-split/main.c:89
 #, c-format
 msgid "error reading %.250s"
 msgstr "fejl ved læsning af %.250s"
 
-#: dpkg-split/main.c:84
+#: dpkg-split/main.c:90
 #, c-format
 msgid "unexpected end of file in %.250s"
 msgstr "uventet filafslutning i %.250s"
 
-#: dpkg-split/main.c:104
+#: dpkg-split/main.c:110
 msgid "part size is far too large or is not positive"
 msgstr "delen er alt for stor, eller størrelsen er ikke positiv"
 
-#: dpkg-split/main.c:108
+#: dpkg-split/main.c:114
 #, c-format
 msgid "part size must be at least %dk (to allow for header)"
 msgstr "delen skal mindst være på %dk (for at få plads til hoved)"
@@ -5832,6 +5815,71 @@ msgstr "kildefil '%.250s' ikke en almindelig fil"
 msgid "unable to exec mksplit"
 msgstr "kunne ikke udføre 'mksplit'"
 
+#~ msgid "Debian GNU/Linux `"
+#~ msgstr "Debian GNU/Linux '"
+
+#~ msgid ""
+#~ "This is free software; see the GNU General Public Licence version 2 or\n"
+#~ "later for copying conditions.  There is NO warranty.\n"
+#~ "See "
+#~ msgstr ""
+#~ "Dette er frit programmel; se \"GNU General Public Licence\" version 2 "
+#~ "eller\n"
+#~ "senere for kopieringsbetingelser. Der er INGEN garanti.\n"
+#~ "Se "
+
+#~ msgid " --licence for copyright and license details.\n"
+#~ msgstr "--licence for detaljer om ophavsret og licens.\n"
+
+#~ msgid "Debian `"
+#~ msgstr "Debian '"
+
+#~ msgid "Usage: "
+#~ msgstr "Brug: "
+
+#~ msgid ""
+#~ "Version %s.\n"
+#~ "Copyright (C) 1994-1996 Ian Jackson.\n"
+#~ "Copyright (C) 2000,2001 Wichert Akkerman.\n"
+#~ "This is free software; see the GNU General Public Licence version 2\n"
+#~ "or later for copying conditions.  There is NO warranty.  See\n"
+#~ "dselect --licence for details.\n"
+#~ msgstr ""
+#~ "Version %s.\n"
+#~ "Copyright (C) 1994-1996 Ian Jackson.\n"
+#~ "Copyright (C) 2000,2001 Wichert Akkerman.\n"
+#~ "\n"
+#~ "Dette er frit programmel; se GNU General Public Licence version 2\n"
+#~ "eller senere for forhold vedrørende kopiering. Der er INGEN garanti. Se\n"
+#~ "\"dselect --licence\" for detaljer.\n"
+
+#~ msgid ""
+#~ "Usage: dselect [options]\n"
+#~ "       dselect [options] action ...\n"
+#~ "Options:  --admindir <directory>  (default is /var/lib/dpkg)\n"
+#~ "          --help  --version  --licence  --expert  --debug <file> | -"
+#~ "D<file>\n"
+#~ "          --colour screenpart:[foreground],[background][:attr[+attr+..]]\n"
+#~ "Actions:  access update select install config remove quit\n"
+#~ msgstr ""
+#~ "Brug: dselect [tilvalg]\n"
+#~ "      dselect [tilvalg] handling ...\n"
+#~ "Tilvalg:  --admindir <mappe>  (standard: /var/lib/dpkg)\n"
+#~ "          --help  --version  --licence  --expert  --debug <fil> | -"
+#~ "D<fil>\n"
+#~ "          --colour skærmområde:[forgrund],[baggrund][:attr[+attr+..]]"
+#~ "Handlinger:  access update select install config remove quit\n"
+
+#~ msgid ""
+#~ "Copyright (C) 1994-1996 Ian Jackson.  This is free software; see the\n"
+#~ "GNU General Public Licence version 2 or later for copying conditions.\n"
+#~ "There is NO warranty.  See dpkg-split --licence for details.\n"
+#~ msgstr ""
+#~ "Copyright (C) 1994-1996 Ian Jackson.  Dette er frit programmel. Se\n"
+#~ "GNU General Public Licence version 2 eller senere for forhold vedrørende\n"
+#~ "kopiering. Der er INGEN garanti.  Se 'dpkg-split --licence' for "
+#~ "detaljerne.\n"
+
 #~ msgid "Type md5sum --help for help."
 #~ msgstr "Skriv 'md5sum --help' for hjælp."