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

ChangeLog

@@ -1,3 +1,35 @@
+2006-02-06  Guillem Jover  <guillem@debian.org>
+
+	* src/main.c (printversion): Do not split strings with a macro in
+	the middle, use C format arguments. Use printf instead of fputs.
+	* src/query.c (printversion): Likewise.
+	* dpkg-deb/main.c (printversion): Likewise.
+	* dpkg-split/main.c (printversion): Likewise.
+
+	* src/main.c (usage): Use printf instead of fprintf. Uppercase initial
+	letter for commands descriptions. Quote strings per line. Standarize
+	indentation. Split globally common strings. Remove program name prefix
+	from command descriptions. Standarize 'Usage:' and 'Commands:'
+	headings. Split independent commands into different lines.
+	* src/query.c (usage): Likewise.
+	* dpkg-deb/main.c (usage): Likewise.
+	* dpkg-split/main.c (usage): Likewise.
+
+	* src/main.c (printforhelp): Use 'license' instead of 'licence'.
+	* src/query.c (printforhelp): Likewise.
+
+	* dselect/main.cc (programdesc): Add version string from ...
+	(copyrightstring): ... here. Move GPL license notice to ...
+	(licensestring): ... here. New variable.
+	(printversion): Use printf instead of fprintf. Give proper arguments
+	to the new formated strings. Print 'licensestring'.
+	(usage): Use printf instead of fprintf. Standarize indentation. Add
+	options descriptions. Add a new line after each section.
+	(curseson): Do not split strings with a macro in the middle, use
+	C format arguments.
+	(refreshmenu): Fix arguments given to 'programdesc' and
+	'copyrightstring' variables. Print 'licensestring' variable.
+
 2006-02-06  Guillem Jover  <guillem@debian.org>
 
 	* utils/start-stop-daemon.c (main): When using --chuid set the HOME

debian/changelog

@@ -4,6 +4,9 @@ dpkg (1.13.14~) UNRELEASED; urgency=low
   * Make start-stop-daemon print the proper version instead of 'VERSION'.
   * Set the HOME environment variable when using the --chuid switch in
     start-stop-daemon. Closes: #295169, #267784
+  * 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
 
   [ Frank Lichtenheld ]
   * Let dpkg-source ignore comments in the hunk header as used by

dpkg-deb/main.c

@@ -43,56 +43,61 @@
 const char* showformat	= "${Package}\t${Version}\n";
 
 static void printversion(void) {
-  if (fputs(_("Debian `"), stdout) < 0) werr("stdout");
-  if (fputs(BACKEND, stdout) < 0) werr("stdout");
-  if (fputs(_("' package archive backend version "), stdout) < 0) werr("stdout");
-  if (fputs(DPKG_VERSION_ARCH ".\n", stdout) < 0) werr("stdout");
-  if (fputs(_("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"),
-	    stdout) < 0) werr("stdout");
+  if (printf(_("Debian `%s' package archive backend version %s.\n"),
+	     BACKEND, DPKG_VERSION_ARCH) < 0) werr("stdout");
+  if (printf(_("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"),
+	     BACKEND) < 0) werr("stdout");
 }
 
 static void usage(void) {
-  if (fputs(_(
-"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"
+  if (printf(_(
+"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 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"
-"\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 package).\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"), BACKEND) < 0) werr("stdout");
+
+  if (printf(_(
 "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"
+"  case left alignment will be used.\n")) < 0) werr("stdout");
+
+  if (printf(_(
 "\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"),
-	    stdout) < 0) werr("stdout");
+"unpacked using `dpkg-deb --extract' will be incorrectly installed !\n")) < 0)
+    werr("stdout");
 }
 
 const char thisname[]= BACKEND;

dpkg-split/main.c

@@ -35,34 +35,40 @@
 #include "dpkg-split.h"
 
 static void printversion(void) {
-  if (fputs
-      (_("Debian GNU/Linux `dpkg-split' package split/join tool; version "), stdout) < 0) werr ("stdout");
-  if (fputs (DPKG_VERSION_ARCH ".\n", stdout) < 0) werr ("stdout");
-  if (fputs (_("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"),
-       stdout) < 0) werr("stdout");
+  if (printf(_("Debian `%s' package split/join tool; version %s.\n"),
+	     SPLITTER, DPKG_VERSION_ARCH) < 0) werr ("stdout");
+  if (printf(_("Copyright (C) 1994-1996 Ian Jackson.\n")) < 0) werr ("stdout");
+  if (printf(_("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"),
+	     SPLITTER) < 0) werr("stdout");
 }
 
 static void usage(void) {
-  if (printf(_("\
-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\
-\n\
-Exit status: 0 = OK;  1 = -a is not a part;  2 = trouble!\n"),
-             ADMINDIR, PARTSDIR) < 0) werr("stdout");
+  if (printf(_(
+"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"),
+	     SPLITTER, ADMINDIR, PARTSDIR) < 0) werr("stdout");
 }
 
 const char thisname[]= SPLITTER;

dselect/main.cc

@@ -147,47 +147,57 @@ static const menuentry menuentries[]= {
 };
 
 static const char programdesc[]=
-      N_("Debian `%s' package handling frontend.");
+      N_("Debian `%s' package handling frontend version %s.\n");
 
 static const char copyrightstring[]= N_(
-      "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");
+      "Copyright (C) 2000,2001 Wichert Akkerman.\n");
+
+static const char licensestring[]= N_(
+      "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");
 
 static void printversion(void) {
-  if (fprintf(stdout,gettext(programdesc),DSELECT) == EOF) werr("stdout");
-  if (fprintf(stdout,"\n") == EOF) werr("stdout");
-  if (fprintf(stdout,gettext(copyrightstring), DPKG_VERSION_ARCH) == EOF) werr("stdout");
+  if (printf(gettext(programdesc), DSELECT, DPKG_VERSION_ARCH) < 0)
+    werr("stdout");
+  if (printf(gettext(copyrightstring)) < 0) werr("stdout");
+  if (printf(gettext(licensestring), DSELECT) < 0) werr("stdout");
 }
 
 static void usage(void) {
   int i;
-  if (!fputs(
-     _("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"),
-       stdout)) werr("stdout");
+  if (printf(_(
+"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"), DSELECT, ADMINDIR) < 0) werr("stdout");
 
   printf(_("Screenparts:\n"));
   for (i=0; screenparttable[i].name; i++)
     printf("  %s", screenparttable[i].name);
-  if (!fputs("\n", stdout)) werr("stdout");
+  if (!fputs("\n\n", stdout)) werr("stdout");
 
   printf(_("Colours:\n"));
   for (i=0; colourtable[i].name; i++)
     printf("  %s", colourtable[i].name);
-  if (!fputs("\n", stdout)) werr("stdout");
+  if (!fputs("\n\n", stdout)) werr("stdout");
 
   printf(_("Attributes:\n"));
   for (i=0; attrtable[i].name; i++)
     printf("  %s", attrtable[i].name);
-  if (!fputs("\n", stdout)) werr("stdout");
+  if (!fputs("\n\n", stdout)) werr("stdout");
 }
 
 /* These are called by C code, so need to have C calling convention */
@@ -300,9 +310,10 @@ void curseson() {
         fputs(_("Terminal does not appear to support cursor addressing.\n"),stderr);
       if (!smso)
         fputs(_("Terminal does not appear to support highlighting.\n"),stderr);
-      fputs(_("Set your TERM variable correctly, use a better terminal,\n"
-            "or make do with the per-package management tool "),stderr);
-      fputs(DPKG ".\n",stderr);
+      fprintf(stderr,
+	      _("Set your TERM variable correctly, use a better terminal,\n"
+	        "or make do with the per-package management tool %s.\n"),
+	      DPKG);
       ohshit(_("terminal lacks necessary features, giving up"));
     }
   }
@@ -372,7 +383,7 @@ int refreshmenu(void) {
 
   clear();
   attrset(A_BOLD);
-  sprintf(buf,gettext(programdesc),DSELECT);
+  sprintf(buf, gettext(programdesc), DSELECT, DPKG_VERSION_ARCH);
   mvaddnstr(0,0,buf,x-1);
 
   attrset(A_NORMAL);
@@ -386,7 +397,8 @@ int refreshmenu(void) {
          "Press <enter> to confirm selection.   ^L redraws screen.\n\n"));
 
   attrset(A_NORMAL);
-  sprintf(buf,gettext(copyrightstring),DPKG_VERSION_ARCH);
+  addstr(gettext(copyrightstring));
+  sprintf(buf, gettext(licensestring), DSELECT);
   addstr(buf);
 
   l= strlen(admindir);

po/ChangeLog

@@ -1,3 +1,7 @@
+2006-02-06  Guillem Jover  <guillem@debian.org>
+
+	* *.po: Merged with dpkg.pot.
+
 2006-02-06 Jordi Mallach  <jordi@debian.org>
 
 	* ca.po: updated to 1000t

po/bs.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dpkg 1.13\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: 2004-11-27 01:29+0100\n"
 "Last-Translator: Safir Šećerović <sapphire@linux.org.ba>\n"
 "Language-Team: Bosnian <lokal@linux.org.ba>\n"
@@ -1995,116 +1995,121 @@ msgid "failed to exec rm for cleanup"
 msgstr ""
 
 #: src/main.c:44
-msgid "Debian GNU/Linux `"
-msgstr ""
-
-#: src/main.c:46
-msgid "' package management program version "
-msgstr ""
+#, fuzzy, c-format
+msgid "Debian `%s' package management program version %s.\n"
+msgstr "Debianov `%s' program za rukovanje paketima."
 
-#: 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 "
-msgstr ""
-
-#: src/main.c:50 src/query.c:465
-msgid " --licence for copyright and license details.\n"
+"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 ""
+"Verzija %s.\n"
+"Copyright (C) 1994-1996 Ian Jackson.\n"
+"Copyright (C) 2000,2001 Wichert Akkerman.\n"
+"Ovo je slobodan software; pogledajte GNU opštu javnu licencu verzije 2\n"
+"ili kasniju za uslove kopiranja.  NEMA garancije.  Pogledajte\n"
+"dselect --licence za detalje.\n"
 
-#: src/main.c:58
+#: src/main.c:57
 #, 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 ""
 
-#: src/main.c:119
+#: src/main.c:121
 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 "
 "`more' !"
 msgstr ""
 
-#: 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 ""
 
-#: src/main.c:189
+#: src/main.c:191
 #, c-format
 msgid "Warning: obsolete option `--%s'\n"
 msgstr ""
 
-#: src/main.c:197
+#: src/main.c:199
 #, c-format
 msgid ""
 "%s debugging option, --debug=<octal> or -D<octal>:\n"
@@ -2125,26 +2130,26 @@ msgid ""
 "Note that the meanings and values are subject to change.\n"
 msgstr ""
 
-#: src/main.c:216
+#: src/main.c:218
 msgid "--debug requires an octal argument"
 msgstr ""
 
-#: src/main.c:240
+#: src/main.c:242
 #, c-format
 msgid "null package name in --ignore-depends comma-separated list `%.250s'"
 msgstr ""
 
-#: src/main.c:246
+#: src/main.c:248
 #, c-format
 msgid "--ignore-depends requires a legal package name. `%.250s' is not; %s"
 msgstr ""
 
-#: 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 ""
 
-#: src/main.c:292
+#: src/main.c:294
 #, c-format
 msgid ""
 "%s forcing options - control behaviour when problems found:\n"
@@ -2185,48 +2190,48 @@ msgid ""
 "Forcing options marked [*] are enabled by default.\n"
 msgstr ""
 
-#: src/main.c:337
+#: src/main.c:339
 #, c-format
 msgid "unknown force/refuse option `%.*s'"
 msgstr ""
 
-#: src/main.c:442 src/main.c:446
+#: src/main.c:444 src/main.c:448
 msgid "couldn't malloc in execbackend"
 msgstr ""
 
-#: src/main.c:444 src/main.c:451
+#: src/main.c:446 src/main.c:453
 msgid "couldn't strdup in execbackend"
 msgstr ""
 
-#: src/main.c:455
+#: src/main.c:457
 #, c-format
 msgid "failed to exec %s"
 msgstr ""
 
-#: src/main.c:467
+#: src/main.c:469
 msgid "--command-fd takes 1 argument, not 0"
 msgstr ""
 
-#: src/main.c:468
+#: src/main.c:470
 msgid "--command-fd only takes 1 argument"
 msgstr ""
 
-#: src/main.c:470
+#: src/main.c:472
 msgid "invalid number for --command-fd"
 msgstr ""
 
-#: src/main.c:472
+#: src/main.c:474
 #, c-format
 msgid "couldn't open `%i' for stream"
 msgstr ""
 
-#: src/main.c:497
+#: src/main.c:499
 #, c-format
 msgid "unexpected eof before end of line %d"
 msgstr ""
 
-#: 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 ""
 
@@ -2594,37 +2599,36 @@ msgid ""
 "and dpkg --contents (= dpkg-deb --contents) to list their contents.\n"
 msgstr ""
 
-#: src/query.c:459 dpkg-deb/main.c:46
-msgid "Debian `"
-msgstr "Debian `"
-
-#: src/query.c:461
-msgid "' package management program query tool\n"
-msgstr ""
-
-#: src/query.c:473
-#, c-format
-msgid "Usage: "
-msgstr "Upotreba:"
+#: src/query.c:459
+#, fuzzy, c-format
+msgid "Debian `%s' package management program query tool\n"
+msgstr "Debianov `%s' program za rukovanje paketima."
 
-#: src/query.c:474
+#: src/query.c:472
 #, 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"
+msgstr ""
+
+#: 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"
@@ -2633,13 +2637,13 @@ msgid ""
 "width]}\n"
 "  syntax. Fields will be right-aligned unless the width is negative in "
 "which\n"
-"   case left aligenment will be used. \n"
+"  case left alignment will be used.\n"
 msgstr ""
 
 #: src/query.c:501
 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 ""
 
@@ -3453,97 +3457,97 @@ msgid "menu"
 msgstr "meni"
 
 #: 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 "Debianov `%s' program za rukovanje paketima."
 
 #: 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 ""
-"Verzija %s.\n"
-"Copyright (C) 1994-1996 Ian Jackson.\n"
-"Copyright (C) 2000,2001 Wichert Akkerman.\n"
-"Ovo je slobodan software; pogledajte GNU opštu javnu licencu verzije 2\n"
-"ili kasniju za uslove kopiranja.  NEMA garancije.  Pogledajte\n"
-"dselect --licence za detalje.\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"
+"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:177
+#: dselect/main.cc:187
 #, c-format
 msgid "Screenparts:\n"
 msgstr ""
 
-#: dselect/main.cc:182
+#: dselect/main.cc:192
 #, c-format
 msgid "Colours:\n"
 msgstr "Boje:\n"
 
-#: dselect/main.cc:187
+#: dselect/main.cc:197
 #, c-format
 msgid "Attributes:\n"
 msgstr ""
 
-#: dselect/main.cc:207
+#: dselect/main.cc:217
 #, c-format
 msgid "couldn't open debug file `%.255s'\n"
 msgstr ""
 
-#: dselect/main.cc:222
+#: dselect/main.cc:232
 #, c-format
 msgid "Invalid %s `%s'\n"
 msgstr ""
 
-#: dselect/main.cc:239
+#: dselect/main.cc:249
 msgid "screen part"
 msgstr ""
 
-#: dselect/main.cc:245
+#: dselect/main.cc:255
 msgid "Null colour specification\n"
 msgstr ""
 
-#: dselect/main.cc:253 dselect/main.cc:258
+#: dselect/main.cc:263 dselect/main.cc:268
 msgid "colour"
 msgstr "boja"
 
-#: dselect/main.cc:266
+#: dselect/main.cc:276
 msgid "colour attribute"
 msgstr ""
 
-#: dselect/main.cc:300
+#: dselect/main.cc:310
 msgid "Terminal does not appear to support cursor addressing.\n"
 msgstr ""
 
-#: dselect/main.cc:302
+#: dselect/main.cc:312
 msgid "Terminal does not appear to support highlighting.\n"
 msgstr ""
 
-#: dselect/main.cc:303
+#: dselect/main.cc:314
+#, 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 ""
 
-#: dselect/main.cc:306
+#: dselect/main.cc:317
 msgid "terminal lacks necessary features, giving up"
 msgstr ""
 
-#: dselect/main.cc:384
+#: dselect/main.cc:395
 msgid ""
 "\n"
 "\n"
@@ -3552,18 +3556,18 @@ msgid ""
 "\n"
 msgstr ""
 
-#: dselect/main.cc:398
+#: dselect/main.cc:410
 msgid ""
 "\n"
 "\n"
 "Read-only access: only preview of selections is available!"
 msgstr ""
 
-#: dselect/main.cc:417
+#: dselect/main.cc:429
 msgid "failed to getch in main menu"
 msgstr ""
 
-#: dselect/main.cc:490
+#: dselect/main.cc:502
 #, c-format
 msgid "unknown action string `%.50s'"
 msgstr ""
@@ -4756,68 +4760,62 @@ msgstr "Greška u formatu"
 msgid "--contents takes exactly one argument"
 msgstr ""
 
-#: dpkg-deb/main.c:48
-msgid "' package archive backend version "
-msgstr ""
-
-#: 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 ""
+#: dpkg-deb/main.c:46
+#, fuzzy, c-format
+msgid "Debian `%s' package archive backend version %s.\n"
+msgstr "Debianov `%s' program za rukovanje paketima."
 
-#: dpkg-deb/main.c:58
+#: dpkg-deb/main.c:56
+#, 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"
+msgstr ""
+
+#: 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:100
+#: 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."
 msgstr ""
 
-#: dpkg-deb/main.c:176
+#: dpkg-deb/main.c:181
 #, c-format
 msgid "unknown compression type `%s'!"
 msgstr ""
@@ -4966,66 +4964,68 @@ msgstr ""
 msgid "part %d is missing"
 msgstr ""
 
-#: dpkg-split/main.c:39
-msgid "Debian GNU/Linux `dpkg-split' package split/join tool; version "
-msgstr ""
+#: dpkg-split/main.c:38
+#, fuzzy, c-format
+msgid "Debian `%s' package split/join tool; version %s.\n"
+msgstr "Debianov `%s' program za rukovanje paketima."
 
-#: 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 ""
 
-#: dpkg-split/main.c:48
+#: dpkg-split/main.c:49
 #, 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"
+"Usage: %s [<option> ...] <command>\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"
+"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:  --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"
+"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 ""
 
-#: dpkg-split/main.c:69
+#: dpkg-split/main.c:75
 msgid "Type dpkg-split --help for help."
 msgstr ""
 
-#: dpkg-split/main.c:79
+#: dpkg-split/main.c:85
 #, c-format
 msgid "error reading %s"
 msgstr ""
 
-#: dpkg-split/main.c:83
+#: dpkg-split/main.c:89
 #, c-format
 msgid "error reading %.250s"
 msgstr ""
 
-#: dpkg-split/main.c:84
+#: dpkg-split/main.c:90
 #, c-format
 msgid "unexpected end of file in %.250s"
 msgstr ""
 
-#: dpkg-split/main.c:104
+#: dpkg-split/main.c:110
 msgid "part size is far too large or is not positive"
 msgstr ""
 
-#: 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 ""
@@ -5159,3 +5159,9 @@ msgstr ""
 #: dpkg-split/split.c:70
 msgid "unable to exec mksplit"
 msgstr ""
+
+#~ msgid "Debian `"
+#~ msgstr "Debian `"
+
+#~ msgid "Usage: "
+#~ msgstr "Upotreba:"

po/ca.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dpkg 1.13\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-02-05 22:07+0100\n"
 "Last-Translator: Jordi Mallach <jordi@debian.org>\n"
 "Language-Team: Catalan <debian-l10n-catalan@lists.debian.org>\n"
@@ -2165,93 +2165,90 @@ msgstr "s'ha produït un error en fer «rmdir»/«unlink» sobre «%.255s»"
 msgid "failed to exec rm for cleanup"
 msgstr "s'ha produït un error en executar «rm» per a netejar"
 
-# FIXME BAD BAD BAD
 #: src/main.c:44
-msgid "Debian GNU/Linux `"
-msgstr "Gestor de paquets «"
-
-#: src/main.c:46
-msgid "' package management program version "
+#, fuzzy, c-format
+msgid "Debian `%s' package management program version %s.\n"
 msgstr "» de Debian GNU/Linux, versió "
 
-#: 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 ""
-"Aquest és programari lliure; vegeu la Llicència Pública General GNU versió "
-"2\n"
-"o posterior per les condicions de còpia. No hi ha CAP garantia.\n"
-"Vegeu "
-
-#: src/main.c:50 src/query.c:465
-msgid " --licence for copyright and license details.\n"
-msgstr " --licence pels detalls de copyright i llicència.\n"
+"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"
+"Vegeu dpkg-deb --licence per a més detalls.\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 ""
@@ -2347,14 +2344,15 @@ msgstr ""
 "\n"
 "Useu «dselect» o «aptitude» per a una gestió de paquets més amigable.\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 "
@@ -2374,17 +2372,17 @@ msgstr ""
 "Les opcions marcades amb ([*]) produeixen una eixida estesa - canalitzeu-la "
 "a través de «less» o «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 "accions en conflicte --%s i --%s"
 
-#: src/main.c:189
+#: src/main.c:191
 #, c-format
 msgid "Warning: obsolete option `--%s'\n"
 msgstr "Avís: l'opció és obsoleta «--%s»\n"
 
-#: src/main.c:197
+#: src/main.c:199
 #, c-format
 msgid ""
 "%s debugging option, --debug=<octal> or -D<octal>:\n"
@@ -2421,29 +2419,29 @@ msgstr ""
 "Les opcions de depuració es barregen fent el OR bit a bit.\n"
 "Noteu que els significats i els valors estan subjectes a canvis.\n"
 
-#: src/main.c:216
+#: src/main.c:218
 msgid "--debug requires an octal argument"
 msgstr "--debug requereix d'un número octal com a paràmetre"
 
-#: src/main.c:240
+#: src/main.c:242
 #, c-format
 msgid "null package name in --ignore-depends comma-separated list `%.250s'"
 msgstr ""
 "nom de paquet buit en la llista de --ignore-depends separats per coma "
 "«%.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 necessita un nom de paquet legal. «%.250s» no ho és; %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 "enter invàlid per a --%s: «%.250s»"
 
-#: src/main.c:292
+#: src/main.c:294
 #, c-format
 msgid ""
 "%s forcing options - control behaviour when problems found:\n"
@@ -2533,48 +2531,48 @@ msgstr ""
 "seriosament la instal·lació. Les opcions de forçat marcades amb [*] estan\n"
 "activades per defecte.\n"
 
-#: src/main.c:337
+#: src/main.c:339
 #, c-format
 msgid "unknown force/refuse option `%.*s'"
 msgstr "opció force/refuse desconeguda «%.*s»"
 
-#: src/main.c:442 src/main.c:446
+#: src/main.c:444 src/main.c:448
 msgid "couldn't malloc in execbackend"
 msgstr "no s'ha pogut fer «malloc» en execbackend"
 
-#: src/main.c:444 src/main.c:451
+#: src/main.c:446 src/main.c:453
 msgid "couldn't strdup in execbackend"
 msgstr "no s'ha pogut fer «strdup» en execbackend"
 
-#: src/main.c:455
+#: src/main.c:457
 #, c-format
 msgid "failed to exec %s"
 msgstr "no s'ha pogut executar %s"
 
-#: src/main.c:467
+#: src/main.c:469
 msgid "--command-fd takes 1 argument, not 0"
 msgstr "--command-fd accepta 1 argument, no 0"
 
-#: src/main.c:468
+#: src/main.c:470
 msgid "--command-fd only takes 1 argument"
 msgstr "--command-fd només accepta 1 argument"
 
-#: src/main.c:470
+#: src/main.c:472
 msgid "invalid number for --command-fd"
 msgstr "número invàlid per a --command-fd"
 
-#: src/main.c:472
+#: src/main.c:474
 #, c-format
 msgid "couldn't open `%i' for stream"
 msgstr "no s'ha pogut obrir «%i» per a un flux"
 
-#: src/main.c:497
+#: src/main.c:499
 #, c-format
 msgid "unexpected eof before end of line %d"
 msgstr "eof inesperat abans de la fí de la línia %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 "es necessita una opció d'acció"
 
@@ -2969,47 +2967,32 @@ msgstr ""
 "Useu dpkg --info (= dpkg-deb --info) per a examinar els fitxers d'arxiu,\n"
 "i dpkg --contents (= dpkg-deb --contents) per a llistar-ne el contingut.\n"
 
-#: src/query.c:459 dpkg-deb/main.c:46
-msgid "Debian `"
-msgstr "Debian «"
-
 # "Debian `dpkg-query' package ..." FIXME. jm
-#: 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 "» eina de consultes al programa de gestió de paquets\n"
 
-#: src/query.c:473
-#, c-format
-msgid "Usage: "
-msgstr "Forma d'ús: "
-
-#: 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 ""
 " [<opció>] <ordre>\n"
 "Ordres:\n"
@@ -3042,10 +3025,25 @@ msgstr ""
 "  dreta a menys que l'amplada siga negativa, en aquest cas s'utilitzarà\n"
 "  alineació a l'esquerra. \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 ""
 "Useu --help per a obtindre ajuda sobre la consulta de paquets;\n"
@@ -4107,107 +4105,99 @@ msgid "menu"
 msgstr "menú"
 
 #: 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 "«%s» - Interfície per a gestionar els paquets de Debian."
 
 #: 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 ""
-"Versió %s.\n"
-"Copyright © 1994-1996 Ian Jackson.\n"
-"Copyright © 2000,2001 Wichert Akkerman.\n"
-"Aquest és programari lliure; vegeu la Llicència Pública General GNU versió "
-"2\n"
-"o posterior per les condicions de còpia. No hi ha CAP garantia. Vegeu\n"
-"dselect --licence per a més detalls.\n"
-
-#: dselect/main.cc:169
+msgstr ""
+
+#: 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 ""
-"Forma d'ús: dselect [opcions]\n"
-"            dselect [opcions] acció ...\n"
-"Opcions:  --admindir <directori>  (per defecte és /var/lib/dpkg)\n"
-"          --help  --version  --licence  --expert  --debug <fitxer> | -"
-"D<fitxer>\n"
-"          --colour screenpart:[foreground],[background][:attr[+attr+..]]\n"
-"Accions: 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 "Parts de la pantalla:\n"
 
-#: dselect/main.cc:182
+#: dselect/main.cc:192
 #, c-format
 msgid "Colours:\n"
 msgstr "Colors:\n"
 
-#: dselect/main.cc:187
+#: dselect/main.cc:197
 #, c-format
 msgid "Attributes:\n"
 msgstr "Atributs:\n"
 
-#: dselect/main.cc:207
+#: dselect/main.cc:217
 #, c-format
 msgid "couldn't open debug file `%.255s'\n"
 msgstr "no es pot obrir el fitxer de depuració «%.255s»\n"
 
-#: dselect/main.cc:222
+#: dselect/main.cc:232
 #, c-format
 msgid "Invalid %s `%s'\n"
 msgstr "%s invàlid: «%s»\n"
 
-#: dselect/main.cc:239
+#: dselect/main.cc:249
 msgid "screen part"
 msgstr "part de la pantalla"
 
-#: dselect/main.cc:245
+#: dselect/main.cc:255
 msgid "Null colour specification\n"
 msgstr "Especificació de color nula\n"
 
-#: dselect/main.cc:253 dselect/main.cc:258
+#: dselect/main.cc:263 dselect/main.cc:268
 msgid "colour"
 msgstr "color"
 
-#: dselect/main.cc:266
+#: dselect/main.cc:276
 msgid "colour attribute"
 msgstr "atribut del color"
 
-#: dselect/main.cc:300
+#: dselect/main.cc:310
 msgid "Terminal does not appear to support cursor addressing.\n"
 msgstr "El terminal no sembla donar suport al direccionament pel cursor.\n"
 
-#: dselect/main.cc:302
+#: dselect/main.cc:312
 msgid "Terminal does not appear to support highlighting.\n"
 msgstr "El terminal sembla no donar suport per a ressaltats.\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 ""
 "Establiu la variable TERM correctament, utilitzeu un terminal millor\n"
 "o feu la construcció amb l'utilitat de gestió per paquet "
 
-#: dselect/main.cc:306
+#: dselect/main.cc:317
 msgid "terminal lacks necessary features, giving up"
 msgstr "el terminal no té les característiques necessàries, s'està avortant"
 
-#: dselect/main.cc:384
+#: dselect/main.cc:395
 msgid ""
 "\n"
 "\n"
@@ -4221,7 +4211,7 @@ msgstr ""
 "Premeu <enter> per a confirmar la selecció.   ^L redibuixa la pantalla.\n"
 "\n"
 
-#: dselect/main.cc:398
+#: dselect/main.cc:410
 msgid ""
 "\n"
 "\n"
@@ -4231,11 +4221,11 @@ msgstr ""
 "\n"
 "Accés de només lectura: només és poden veure les selecciones disponibles!"
 
-#: dselect/main.cc:417
+#: dselect/main.cc:429
 msgid "failed to getch in main menu"
 msgstr "no s'ha pogut fer «getch» en el menú principal"
 
-#: dselect/main.cc:490
+#: dselect/main.cc:502
 #, c-format
 msgid "unknown action string `%.50s'"
 msgstr "la cadena d'acció «%.50s» és desconeguda"
@@ -5471,63 +5461,45 @@ msgstr "Error en el format"
 msgid "--contents takes exactly one argument"
 msgstr "--contents pren exactament un argument"
 
-#: 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 "' package archive backend versió "
 
-#: 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 ""
-"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"
-"Vegeu dpkg-deb --licence per a més detalls.\n"
-
 # FIXME: Show information on package -> Lowercase "Show"
-#: 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 ""
 "Ordre:\n"
 "  -b|--build <directori> [<deb>]    construeix un arxiu.\n"
@@ -5576,7 +5548,16 @@ msgstr ""
 "estaran\n"
 "instal·lats incorrectament!\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."
@@ -5586,7 +5567,7 @@ msgstr ""
 "Escriviu dpkg --help per a obtindre ajuda a sobre de com instal·lar i "
 "desinstal·lar paquets."
 
-#: dpkg-deb/main.c:176
+#: dpkg-deb/main.c:181
 #, c-format
 msgid "unknown compression type `%s'!"
 msgstr "el tipus de compressió «%s» és desconegut!"
@@ -5762,42 +5743,40 @@ msgstr "--join requereix un o més fitxers part com a arguments"
 msgid "part %d is missing"
 msgstr "falta la part %d"
 
-#: 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 "utilitat de divisió/unió «dpkg-split» de Debian GNU/Linux; versió "
 
-#: 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.  Això és programari lliure; mireu la\n"
-"Llicència Pública General de GNU versió 2 o posterior per a les condicions\n"
-"de còpia.  Aquest NO té cap garantia.  Mireu dpkg-split --licence per a més "
-"detalls.\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"
+"Usage: %s [<option> ...] <command>\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"
+"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:  --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"
+"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 ""
@@ -5823,30 +5802,30 @@ msgstr ""
 "\n"
 "Estat d'eixida: 0 = OK;  1 = -a no és una part;  2 = problemes!\n"
 
-#: dpkg-split/main.c:69
+#: dpkg-split/main.c:75
 msgid "Type dpkg-split --help for help."
 msgstr "Escriu dpkg-split --help per a obtindre ajuda."
 
-#: dpkg-split/main.c:79
+#: dpkg-split/main.c:85
 #, c-format
 msgid "error reading %s"
 msgstr "s'ha produït un error al llegir %s"
 
-#: dpkg-split/main.c:83
+#: dpkg-split/main.c:89
 #, c-format
 msgid "error reading %.250s"
 msgstr "s'ha produït un error al llegir %.250s"
 
-#: dpkg-split/main.c:84
+#: dpkg-split/main.c:90
 #, c-format
 msgid "unexpected end of file in %.250s"
 msgstr "s'ha trobat un fí de fitxer inesperat en %.250s"
 
-#: dpkg-split/main.c:104
+#: dpkg-split/main.c:110
 msgid "part size is far too large or is not positive"
 msgstr "la mida de la part és massa gran o no és positiva"
 
-#: 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 ""
@@ -5982,6 +5961,74 @@ msgstr "el fitxer font «%.250s» no és un fitxer normal"
 msgid "unable to exec mksplit"
 msgstr "no es pot executar mksplit"
 
+# FIXME BAD BAD BAD
+#~ msgid "Debian GNU/Linux `"
+#~ msgstr "Gestor de paquets «"
+
+#~ 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 ""
+#~ "Aquest és programari lliure; vegeu la Llicència Pública General GNU "
+#~ "versió 2\n"
+#~ "o posterior per les condicions de còpia. No hi ha CAP garantia.\n"
+#~ "Vegeu "
+
+#~ msgid " --licence for copyright and license details.\n"
+#~ msgstr " --licence pels detalls de copyright i llicència.\n"
+
+#~ msgid "Debian `"
+#~ msgstr "Debian «"
+
+#~ msgid "Usage: "
+#~ msgstr "Forma d'ús: "
+
+#~ 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 ""
+#~ "Versió %s.\n"
+#~ "Copyright © 1994-1996 Ian Jackson.\n"
+#~ "Copyright © 2000,2001 Wichert Akkerman.\n"
+#~ "Aquest és programari lliure; vegeu la Llicència Pública General GNU "
+#~ "versió 2\n"
+#~ "o posterior per les condicions de còpia. No hi ha CAP garantia. Vegeu\n"
+#~ "dselect --licence per a més detalls.\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 ""
+#~ "Forma d'ús: dselect [opcions]\n"
+#~ "            dselect [opcions] acció ...\n"
+#~ "Opcions:  --admindir <directori>  (per defecte és /var/lib/dpkg)\n"
+#~ "          --help  --version  --licence  --expert  --debug <fitxer> | -"
+#~ "D<fitxer>\n"
+#~ "          --colour screenpart:[foreground],[background][:attr[+attr+..]]\n"
+#~ "Accions: 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.  Això és programari lliure; mireu "
+#~ "la\n"
+#~ "Llicència Pública General de GNU versió 2 o posterior per a les "
+#~ "condicions\n"
+#~ "de còpia.  Aquest NO té cap garantia.  Mireu dpkg-split --licence per a "
+#~ "més detalls.\n"
+
 #~ msgid "Type md5sum --help for help."
 #~ msgstr "Teclegeu md5sum --help per a obtindre ajuda."
 

po/cs.po

@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dpkg\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: 2005-12-30 19:05+0100\n"
 "Last-Translator: Miroslav Kure <kurem@debian.cz>\n"
 "Language-Team: Czech <debian-l10n-czech@lists.debian.org>\n"
@@ -2104,91 +2104,90 @@ msgid "failed to exec rm for cleanup"
 msgstr "spuštění rm pro úklid selhalo"
 
 #: 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 "' program pro správu balíků verze "
 
-#: 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 ""
 "Toto je svobodný software; podrobnosti o podmínkách kopírování naleznete\n"
 "v Obecné veřejné licenci GNU (GNU General Public Licence) verze 2 nebo\n"
-"novější. Toto programové vybavení je absolutně bez záruky.\n"
-"Použitím "
-
-#: src/main.c:50 src/query.c:465
-msgid " --licence for copyright and license details.\n"
-msgstr " --licence získáte více informací.\n"
+"pozdější. Toto programové vybavení je absolutně bez záruky.\n"
+"Více informací získáte použitím dpkg-deb --licence.\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 ""
@@ -2262,14 +2261,15 @@ msgstr ""
 "Pro uživatelsky přívětivou správu balíků použijte `dselect' nebo "
 "`aptitude'.\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 "
@@ -2286,17 +2286,17 @@ msgstr ""
 "\n"
 "Volby označené [*] produkují obsáhlý výstup - použijte `less' nebo `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 "odporující si akce --%s a --%s"
 
-#: src/main.c:189
+#: src/main.c:191
 #, c-format
 msgid "Warning: obsolete option `--%s'\n"
 msgstr "Varování: zastaralá volba `--%s'\n"
 
-#: src/main.c:197
+#: src/main.c:199
 #, c-format
 msgid ""
 "%s debugging option, --debug=<octal> or -D<octal>:\n"
@@ -2334,26 +2334,26 @@ msgstr ""
 "Ladící přepínače mohou být mixovány použitím binárního OR.\n"
 "Poznámka: významy a hodnoty se mohou často měnit.\n"
 
-#: src/main.c:216
+#: src/main.c:218
 msgid "--debug requires an octal argument"
 msgstr "--debug vyžaduje oktalový parametr"
 
-#: src/main.c:240
+#: src/main.c:242
 #, c-format
 msgid "null package name in --ignore-depends comma-separated list `%.250s'"
 msgstr "prázdné jméno balíku v seznamu --ignore-depends `%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 potřebuje platné jméno balíku, což `%250s' není; %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 "neplatné číslo pro --%s: `%.250s'"
 
-#: src/main.c:292
+#: src/main.c:294
 #, c-format
 msgid ""
 "%s forcing options - control behaviour when problems found:\n"
@@ -2434,48 +2434,48 @@ msgstr ""
 "VAROVÁNÍ - použití označených [!] přepínačů může vážně poškodit instalaci.\n"
 "Implicitně zapnuté donucovací volby jsou označeny [*].\n"
 
-#: src/main.c:337
+#: src/main.c:339
 #, c-format
 msgid "unknown force/refuse option `%.*s'"
 msgstr "neznámá force/refuse volba `%.*s'"
 
-#: src/main.c:442 src/main.c:446
+#: src/main.c:444 src/main.c:448
 msgid "couldn't malloc in execbackend"
 msgstr "nelze provést malloc() v execbackend"
 
-#: src/main.c:444 src/main.c:451
+#: src/main.c:446 src/main.c:453
 msgid "couldn't strdup in execbackend"
 msgstr "nelze provést strdup v execbackend"
 
-#: src/main.c:455
+#: src/main.c:457
 #, c-format
 msgid "failed to exec %s"
 msgstr "nelze spustit %s"
 
-#: src/main.c:467
+#: src/main.c:469
 msgid "--command-fd takes 1 argument, not 0"
 msgstr "--command-fd vyžaduje jeden parametr"
 
-#: src/main.c:468
+#: src/main.c:470
 msgid "--command-fd only takes 1 argument"
 msgstr "--command-fd vyžaduje pouze jeden parametr"
 
-#: src/main.c:470
+#: src/main.c:472
 msgid "invalid number for --command-fd"
 msgstr "neplatné číslo pro --command-fd"
 
-#: src/main.c:472
+#: src/main.c:474
 #, c-format
 msgid "couldn't open `%i' for stream"
 msgstr "nelze otevřít `%i' pro proud"
 
-#: src/main.c:497
+#: src/main.c:499
 #, c-format
 msgid "unexpected eof before end of line %d"
 msgstr "neočekávaný konec souboru před koncem řádku %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 "potřebuji zadat akci"
 
@@ -2862,46 +2862,31 @@ msgstr ""
 "Použijte dpkg --info (= dpkg-deb --info) k prozkoumání archivu,\n"
 "a dpkg --contents (= dpkg-deb --contents) k vypsání jeho obsahu.\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 "' program pro správu balíků\n"
 
-#: src/query.c:473
-#, c-format
-msgid "Usage: "
-msgstr "Použití: "
-
-#: 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 ""
 " [<volba>] <příkaz>\n"
 "Příkazy:\n"
@@ -2925,10 +2910,25 @@ msgstr ""
 "  odkazů na různá pole balíku dle vzoru ${proměnná[;šířka]}.\n"
 "  Pole budou zarovnaná napravo, záporná šířka je zarovná vlevo.\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 ""
 "Pro nápovědu o dotazování balíků použijte --help;\n"
@@ -3954,106 +3954,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' rozhraní pro správu balíků."
 
 #: 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 ""
-"Verze %s.\n"
-"Copyright (C) 1994-1996 Ian Jackson.\n"
-"Copyright (C) 2000,2001 Wichert Akkerman.\n"
-"Toto je svobodný software; podrobnosti o podmínkách kopírování naleznete\n"
-"v Obecné veřejné licenci GNU (GNU General Public Licence) verze 2 nebo\n"
-"pozdější. Toto programové vybavení je absolutně bez záruky.\n"
-"Použitím dselect --licence získáte více informací.\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"
+"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 ""
-"Použití: dselect [volby]\n"
-"         dselect [volby] akce ...\n"
-"Volby:  --admindir <adresář>  (implicitní je /var/lib/dpkg)\n"
-"        --help  --version  --licence  --expert  --debug <soub> | -D<soub>\n"
-"        --colour screenpart:[popředí],[pozadí][:atribut[+atribut+..]]\n"
-"Akce:   access update select install config remove quit\n"
 
-#: dselect/main.cc:177
+#: dselect/main.cc:187
 #, c-format
 msgid "Screenparts:\n"
 msgstr "Části obrazovky:\n"
 
-#: dselect/main.cc:182
+#: dselect/main.cc:192
 #, c-format
 msgid "Colours:\n"
 msgstr "Barvy:\n"
 
-#: dselect/main.cc:187
+#: dselect/main.cc:197
 #, c-format
 msgid "Attributes:\n"
 msgstr "Atributy:\n"
 
-#: dselect/main.cc:207
+#: dselect/main.cc:217
 #, c-format
 msgid "couldn't open debug file `%.255s'\n"
 msgstr "nepodařilo se otevřít ladící soubor `%.255s'\n"
 
-#: dselect/main.cc:222
+#: dselect/main.cc:232
 #, c-format
 msgid "Invalid %s `%s'\n"
 msgstr "Neplatné %s `%s'\n"
 
-#: dselect/main.cc:239
+#: dselect/main.cc:249
 msgid "screen part"
 msgstr "část obrazovky"
 
-#: dselect/main.cc:245
+#: dselect/main.cc:255
 msgid "Null colour specification\n"
 msgstr "Zadání prázdné barvy\n"
 
-#: dselect/main.cc:253 dselect/main.cc:258
+#: dselect/main.cc:263 dselect/main.cc:268
 msgid "colour"
 msgstr "barva"
 
-#: dselect/main.cc:266
+#: dselect/main.cc:276
 msgid "colour attribute"
 msgstr "atribut barvy"
 
-#: dselect/main.cc:300
+#: dselect/main.cc:310
 msgid "Terminal does not appear to support cursor addressing.\n"
 msgstr "Zdá se, že terminál nepodporuje adresaci kurzoru.\n"
 
-#: dselect/main.cc:302
+#: dselect/main.cc:312
 msgid "Terminal does not appear to support highlighting.\n"
 msgstr "Zdá se, že terminál nepodporuje zvýrazňování.\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 ""
 "Nastavte správně proměnnou TERM, použijte lepší terminál\n"
 "nebo použijte řádkový nástroj pro správu balíků "
 
-#: dselect/main.cc:306
+#: dselect/main.cc:317
 msgid "terminal lacks necessary features, giving up"
 msgstr "terminál postrádá nezbytné funkce, vzdávám to"
 
-#: dselect/main.cc:384
+#: dselect/main.cc:395
 msgid ""
 "\n"
 "\n"
@@ -4068,7 +4061,7 @@ msgstr ""
 "číslic; Volbu potvrďte stiskem klávesy <enter>. Obrazovku překreslí ^L.\n"
 "\n"
 
-#: dselect/main.cc:398
+#: dselect/main.cc:410
 msgid ""
 "\n"
 "\n"
@@ -4078,11 +4071,11 @@ msgstr ""
 "\n"
 "Přístup pouze pro čtení: k dispozici je pouze přehled aktuálních nastavení!"
 
-#: dselect/main.cc:417
+#: dselect/main.cc:429
 msgid "failed to getch in main menu"
 msgstr "nepovedlo se getch v hlavním menu"
 
-#: dselect/main.cc:490
+#: dselect/main.cc:502
 #, c-format
 msgid "unknown action string `%.50s'"
 msgstr "neznámý akční řetězec `%.50s'"
@@ -5302,63 +5295,44 @@ msgstr "Chyba ve formátu"
 msgid "--contents takes exactly one argument"
 msgstr "--contents vyžaduje právě jeden parametr"
 
-#: 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 "' verze "
 
-#: dpkg-deb/main.c:50
+#: dpkg-deb/main.c:56
+#, 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 dpkg-deb --licence for details.\n"
-msgstr ""
-"Toto je svobodný software; podrobnosti o podmínkách kopírování naleznete\n"
-"v Obecné veřejné licenci GNU (GNU General Public Licence) verze 2 nebo\n"
-"pozdější. Toto programové vybavení je absolutně bez záruky.\n"
-"Více informací získáte použitím dpkg-deb --licence.\n"
-
-#: dpkg-deb/main.c:58
-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 ""
 "Příkaz:\n"
 "  -b|--build <adresář> [<deb>]     Vytvoří archiv.\n"
@@ -5398,7 +5372,16 @@ msgstr ""
 "`dselect' či `aptitude' pro přívětivou správu balíčků. Balíky rozbalené\n"
 "pomocí `dpkg-deb --extract' nebudou správně nainstalované!\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."
@@ -5406,7 +5389,7 @@ msgstr ""
 "Napište dpkg-deb --help k získání nápovědy k manipulaci s *.deb soubory;\n"
 "Napište dpkg --help k získání informací o instalování a odinstalování balíků."
 
-#: dpkg-deb/main.c:176
+#: dpkg-deb/main.c:181
 #, c-format
 msgid "unknown compression type `%s'!"
 msgstr "neznámý typ komprese `%s'!"
@@ -5569,45 +5552,42 @@ msgstr "--join potřebuje jména částí souboru jako parametr"
 msgid "part %d is missing"
 msgstr "%d. část chybí"
 
-#: 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' - nástroj na dělení/slučování balíků;\n"
 " verze "
 
-#: 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. Toto je volně šiřitelné programové\n"
-"vybavení; podrobnosti o pravidlech kopírování naleznete v Obecné veřejné\n"
-"licenci GNU (GNU General Public Licence) verze 2 nebo pozdější. Toto\n"
-"programové vybavení je absolutně bez záruky. Použitím dpkg-split --licence\n"
-"získáte více informací.\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 ""
@@ -5633,30 +5613,30 @@ msgstr ""
 "\n"
 "Výstupní stavy: 0 = OK;  1 = -a a není částí;  2 = problémy!\n"
 
-#: dpkg-split/main.c:69
+#: dpkg-split/main.c:75
 msgid "Type dpkg-split --help for help."
 msgstr "Napište dpkg-split --help pro získání nápovědy."
 
-#: dpkg-split/main.c:79
+#: dpkg-split/main.c:85
 #, c-format
 msgid "error reading %s"
 msgstr "chyba při čtení %s"
 
-#: dpkg-split/main.c:83
+#: dpkg-split/main.c:89
 #, c-format
 msgid "error reading %.250s"
 msgstr "chyba při čtení %.250s"
 
-#: dpkg-split/main.c:84
+#: dpkg-split/main.c:90
 #, c-format
 msgid "unexpected end of file in %.250s"
 msgstr "neočekávaný konec souboru v %.250s"
 
-#: dpkg-split/main.c:104
+#: dpkg-split/main.c:110
 msgid "part size is far too large or is not positive"
 msgstr "velikost části je buď příliš veliká, nebo nekladná"
 
-#: 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 "velikost části musí být alespoň %dk (kvůli hlavičce)"
@@ -5791,6 +5771,73 @@ msgstr "zdrojový soubor `%.250s' není obyčejným souborem"
 msgid "unable to exec mksplit"
 msgstr "nelze spustit 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 ""
+#~ "Toto je svobodný software; podrobnosti o podmínkách kopírování naleznete\n"
+#~ "v Obecné veřejné licenci GNU (GNU General Public Licence) verze 2 nebo\n"
+#~ "novější. Toto programové vybavení je absolutně bez záruky.\n"
+#~ "Použitím "
+
+#~ msgid " --licence for copyright and license details.\n"
+#~ msgstr " --licence získáte více informací.\n"
+
+#~ msgid "Debian `"
+#~ msgstr "Debian `"
+
+#~ msgid "Usage: "
+#~ msgstr "Použití: "
+
+#~ 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 ""
+#~ "Verze %s.\n"
+#~ "Copyright (C) 1994-1996 Ian Jackson.\n"
+#~ "Copyright (C) 2000,2001 Wichert Akkerman.\n"
+#~ "Toto je svobodný software; podrobnosti o podmínkách kopírování naleznete\n"
+#~ "v Obecné veřejné licenci GNU (GNU General Public Licence) verze 2 nebo\n"
+#~ "pozdější. Toto programové vybavení je absolutně bez záruky.\n"
+#~ "Použitím dselect --licence získáte více informací.\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 ""
+#~ "Použití: dselect [volby]\n"
+#~ "         dselect [volby] akce ...\n"
+#~ "Volby:  --admindir <adresář>  (implicitní je /var/lib/dpkg)\n"
+#~ "        --help  --version  --licence  --expert  --debug <soub> | -"
+#~ "D<soub>\n"
+#~ "        --colour screenpart:[popředí],[pozadí][:atribut[+atribut+..]]\n"
+#~ "Akce:   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. Toto je volně šiřitelné programové\n"
+#~ "vybavení; podrobnosti o pravidlech kopírování naleznete v Obecné veřejné\n"
+#~ "licenci GNU (GNU General Public Licence) verze 2 nebo pozdější. Toto\n"
+#~ "programové vybavení je absolutně bez záruky. Použitím dpkg-split --"
+#~ "licence\n"
+#~ "získáte více informací.\n"
+
 #~ msgid "Type md5sum --help for help."
 #~ msgstr "Napište md5sum --help pro získání nápovědy."
 

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
 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."
 

po/de.po

@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Debian dpkg 1.13.11\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: 2005-08-19 15:34+0200\n"
 "Last-Translator: Michael Piefel <piefel@debian.org>\n"
 "Language-Team: German <de@debian-l10n-german@lists.debian.org>\n"
@@ -2132,91 +2132,90 @@ msgid "failed to exec rm for cleanup"
 msgstr "konnte rm nicht zum Aufräumen ausführen"
 
 #: 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 "“ Paketmanagement-Programm 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 ""
 "Dies ist freie Software; lesen Sie die GNU General Public Licence in der\n"
 "Version 2 oder höher für Kopierbedingungen. Es wird KEINE Haftung "
 "übernommen.\n"
-"Siehe auch "
-
-#: src/main.c:50 src/query.c:465
-msgid " --licence for copyright and license details.\n"
-msgstr "--licence für Details zum Copyright und der Lizenz.\n"
+"Siehe auch dpkg-deb --licence für Details.\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 ""
@@ -2300,14 +2299,15 @@ msgstr ""
 "Benutzen Sie „dselect“ oder „aptitude“ für benutzerfreundliches "
 "Paketmanagement.\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 "
@@ -2323,17 +2323,17 @@ msgstr ""
 "\n"
 "Optionen mit [*] geben viel aus - schicken Sie es durch „less“ oder „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 "Aktionen --%s und --%s stehen in Konflikt"
 
-#: src/main.c:189
+#: src/main.c:191
 #, c-format
 msgid "Warning: obsolete option `--%s'\n"
 msgstr "Warnung: veraltete Option „--%s“\n"
 
-#: src/main.c:197
+#: src/main.c:199
 #, c-format
 msgid ""
 "%s debugging option, --debug=<octal> or -D<octal>:\n"
@@ -2370,27 +2370,27 @@ msgstr ""
 "Debug-Optionen werden durch bitweises Oder zusammengesetzt.\n"
 "Beachten Sie, dass sich die Werte und Bedeutungen ändern können.\n"
 
-#: src/main.c:216
+#: src/main.c:218
 msgid "--debug requires an octal argument"
 msgstr "--debug braucht ein oktales Argument"
 
-#: src/main.c:240
+#: src/main.c:242
 #, c-format
 msgid "null package name in --ignore-depends comma-separated list `%.250s'"
 msgstr "leerer Paketname in kommagetrennter --ignore-depends-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 braucht einen legalen Paketnamen. „%.250s“ ist es nicht; %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 "ungültige Zahl für --%s: „%.250s“"
 
-#: src/main.c:292
+#: src/main.c:294
 #, c-format
 msgid ""
 "%s forcing options - control behaviour when problems found:\n"
@@ -2480,49 +2480,49 @@ msgstr ""
 "schwer\n"
 "beschädigen. Optionen markierten mit [*] sind per Vorgabe angestellt.\n"
 
-#: src/main.c:337
+#: src/main.c:339
 #, c-format
 msgid "unknown force/refuse option `%.*s'"
 msgstr "unbekannte force/refuse-Option „%.*s“"
 
-#: src/main.c:442 src/main.c:446
+#: src/main.c:444 src/main.c:448
 msgid "couldn't malloc in execbackend"
 msgstr "konnte kein malloc durchführen in execbackend"
 
-#: src/main.c:444 src/main.c:451
+#: src/main.c:446 src/main.c:453
 msgid "couldn't strdup in execbackend"
 msgstr "konnte kein strdup durchführen in execbackend"
 
-#: src/main.c:455
+#: src/main.c:457
 #, c-format
 msgid "failed to exec %s"
 msgstr "konnte %s nicht ausführen"
 
-#: src/main.c:467
+#: src/main.c:469
 msgid "--command-fd takes 1 argument, not 0"
 msgstr "--command-fd nimmt 1 Argument, nicht 0"
 
 #
-#: src/main.c:468
+#: src/main.c:470
 msgid "--command-fd only takes 1 argument"
 msgstr "--command-fd nimmt nur 1 Argument"
 
-#: src/main.c:470
+#: src/main.c:472
 msgid "invalid number for --command-fd"
 msgstr "ungültige Zahl für --command-fd"
 
-#: src/main.c:472
+#: src/main.c:474
 #, c-format
 msgid "couldn't open `%i' for stream"
 msgstr "konnte „%i“ nicht für Stream öffnen"
 
-#: src/main.c:497
+#: src/main.c:499
 #, c-format
 msgid "unexpected eof before end of line %d"
 msgstr "unerwartetes Dateiende vor Ende der Zeile %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 "brauche eine Aktions-Option"
 
@@ -2916,46 +2916,31 @@ msgstr ""
 "und     dpkg --contents (= dpkg-deb --contents) zum Auflisten ihres "
 "Inhalts.\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 "“ Paketmanagement-Programm-Abfrage-Werkzeug\n"
 
-#: src/query.c:473
-#, c-format
-msgid "Usage: "
-msgstr "Aufruf: "
-
-#: 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 ""
 " [<Option>] <Befehl>\n"
 "Befehle:\n"
@@ -2983,10 +2968,25 @@ msgstr ""
 "normalerweise\n"
 "  rechts ausgerichtet; wenn die Breite negativ ist, dann links.\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 ""
 "Nutzen Sie --help für Hilfe zur Abfragen von Paketen;\n"
@@ -4055,108 +4055,99 @@ msgid "menu"
 msgstr "Menü"
 
 #: 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“ Paketverwaltungsprogramm"
 
 #: 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"
-"Dies ist freie Software; Nutzungskonditionen können in der GNU General "
-"Public\n"
-"Licence Version 2 oder später nachgelesen werden. Es wird KEINE Haftung\n"
-"übernommen. Siehe auch dselect --licence für Details.\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 ""
-"Aufruf: dselect [Optionen]\n"
-"        dselect [Optionen] Aktion ...\n"
-"Optionen:  --admindir <Verzeichnis>  (Voreinstellung ist /var/lib/dpkg)\n"
-"           --help  --version  --licence  --expert  --debug <Datei> | -"
-"D<Datei>\n"
-"           --colour bildteil:[vordergrund],[hintergrund][:attr[+attr+..]]\n"
-"Aktionen:  access update select install config remove quit menu\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 "Bildschirmteile:\n"
 
-#: dselect/main.cc:182
+#: dselect/main.cc:192
 #, c-format
 msgid "Colours:\n"
 msgstr "Farben:\n"
 
-#: dselect/main.cc:187
+#: dselect/main.cc:197
 #, c-format
 msgid "Attributes:\n"
 msgstr "Attribute:\n"
 
-#: dselect/main.cc:207
+#: dselect/main.cc:217
 #, c-format
 msgid "couldn't open debug file `%.255s'\n"
 msgstr "konnte Debug-Datei „%.255s“ nicht öffnen\n"
 
-#: dselect/main.cc:222
+#: dselect/main.cc:232
 #, c-format
 msgid "Invalid %s `%s'\n"
 msgstr "Ungültige(r/s) %s „%s“\n"
 
-#: dselect/main.cc:239
+#: dselect/main.cc:249
 msgid "screen part"
 msgstr "Bildschirmteil"
 
-#: dselect/main.cc:245
+#: dselect/main.cc:255
 msgid "Null colour specification\n"
 msgstr "Leere Farbspezifikation\n"
 
-#: dselect/main.cc:253 dselect/main.cc:258
+#: dselect/main.cc:263 dselect/main.cc:268
 msgid "colour"
 msgstr "Farbe"
 
-#: dselect/main.cc:266
+#: dselect/main.cc:276
 msgid "colour attribute"
 msgstr "Farbattribut"
 
-#: dselect/main.cc:300
+#: dselect/main.cc:310
 msgid "Terminal does not appear to support cursor addressing.\n"
 msgstr "Das Terminal scheint Cursoradressierung nicht zu unterstützen.\n"
 
-#: dselect/main.cc:302
+#: dselect/main.cc:312
 msgid "Terminal does not appear to support highlighting.\n"
 msgstr "Das Terminal scheint Hervorhebung nicht zu unterstützen.\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 ""
 "Setzen Sie ihre TERM-Variable richtig, nutzen Sie ein besseres Terminal,\n"
 "oder geben Sie sich zufrieden mit dem Werkzeug zur paketweisen Verwaltung "
 
-#: dselect/main.cc:306
+#: dselect/main.cc:317
 msgid "terminal lacks necessary features, giving up"
 msgstr "Terminal lässt notwendige Fähigkeiten vermissen, gebe auf"
 
-#: dselect/main.cc:384
+#: dselect/main.cc:395
 msgid ""
 "\n"
 "\n"
@@ -4170,7 +4161,7 @@ msgstr ""
 "Drücken Sie <Eingabe> zur Bestätigung.   ^L zeichnet den Bildschirm neu.\n"
 "\n"
 
-#: dselect/main.cc:398
+#: dselect/main.cc:410
 msgid ""
 "\n"
 "\n"
@@ -4180,11 +4171,11 @@ msgstr ""
 "\n"
 "Nur-Lese-Zugriff: Es ist nur eine Vorschau der Auswahlen verfügbar!"
 
-#: dselect/main.cc:417
+#: dselect/main.cc:429
 msgid "failed to getch in main menu"
 msgstr "konnte getch im Hauptmenü nicht ausführen"
 
-#: dselect/main.cc:490
+#: dselect/main.cc:502
 #, c-format
 msgid "unknown action string `%.50s'"
 msgstr "unbekannte Aktionszeichenkette „%.50s“"
@@ -5414,63 +5405,44 @@ msgid "--contents takes exactly one argument"
 msgstr "--contents nimmt genau ein Argument"
 
 #
-#: 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 "“ Paketarchiv-Backend 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 ""
-"Dies ist freie Software; lesen Sie die GNU General Public Licence in der\n"
-"Version 2 oder höher für Kopierbedingungen. Es wird KEINE Haftung "
-"übernommen.\n"
-"Siehe auch dpkg-deb --licence für Details.\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"
-"\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"
+"  -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"
-"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 ""
 "Befehl:\n"
 "  -b|--build <Verz.> [<deb>]     Archiv bauen.\n"
@@ -5515,7 +5487,16 @@ msgstr ""
 "werden\n"
 "inkorrekt installiert!\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."
@@ -5523,7 +5504,7 @@ msgstr ""
 "Geben Sie dpkg-deb --help ein für Hilfe zum Verändern von *.deb-Dateien;\n"
 "Geben Sie dpkg --help ein für Hilfe zum (De-)Installieren von Paketen."
 
-#: dpkg-deb/main.c:176
+#: dpkg-deb/main.c:181
 #, c-format
 msgid "unknown compression type `%s'!"
 msgstr "unbekannter Komprimierungstyp „%s“!"
@@ -5692,44 +5673,41 @@ msgstr "--join braucht eine oder mehrere Teildateien als Argument"
 msgid "part %d is missing"
 msgstr "Teil %d fehlt"
 
-#: 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“ Paket-Aufteil/Zusammenfüg-Werkzeug; 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.  Dies ist freie Software; Nutzungs-\n"
-"Konditionen können in der GNU General Public Licence Version 2 oder später\n"
-"nachgelesen werden.\n"
-"Es wird KEINE Haftung übernommen. Siehe auch dpkg-split --licence für "
-"Details.\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 ""
@@ -5751,30 +5729,30 @@ msgstr ""
 "\n"
 "Exit-Status: 0 = OK;  1 = -a ist kein Teil;  2 = Probleme!\n"
 
-#: dpkg-split/main.c:69
+#: dpkg-split/main.c:75
 msgid "Type dpkg-split --help for help."
 msgstr "Geben Sie dpkg-split --help ein für Hilfe."
 
-#: dpkg-split/main.c:79
+#: dpkg-split/main.c:85
 #, c-format
 msgid "error reading %s"
 msgstr "Fehler beim Lesen von %s"
 
-#: dpkg-split/main.c:83
+#: dpkg-split/main.c:89
 #, c-format
 msgid "error reading %.250s"
 msgstr "Fehler beim Lesen von %.250s"
 
-#: dpkg-split/main.c:84
+#: dpkg-split/main.c:90
 #, c-format
 msgid "unexpected end of file in %.250s"
 msgstr "Unerwartetes Ende der Datei %.250s"
 
-#: dpkg-split/main.c:104
+#: dpkg-split/main.c:110
 msgid "part size is far too large or is not positive"
 msgstr "Teilgröße ist viel zu groß oder nicht 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 "Teilgröße muss mindestens %dk sein (für den Header)"
@@ -5909,6 +5887,75 @@ msgstr "Quelldatei „%.250s“ ist keine gewöhnliche Datei"
 msgid "unable to exec mksplit"
 msgstr "kann mksplit nicht ausführen"
 
+#~ 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 ""
+#~ "Dies ist freie Software; lesen Sie die GNU General Public Licence in der\n"
+#~ "Version 2 oder höher für Kopierbedingungen. Es wird KEINE Haftung "
+#~ "übernommen.\n"
+#~ "Siehe auch "
+
+#~ msgid " --licence for copyright and license details.\n"
+#~ msgstr "--licence für Details zum Copyright und der Lizenz.\n"
+
+#~ msgid "Debian `"
+#~ msgstr "Debian „"
+
+#~ msgid "Usage: "
+#~ msgstr "Aufruf: "
+
+#~ 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"
+#~ "Dies ist freie Software; Nutzungskonditionen können in der GNU General "
+#~ "Public\n"
+#~ "Licence Version 2 oder später nachgelesen werden. Es wird KEINE Haftung\n"
+#~ "übernommen. Siehe auch dselect --licence für Details.\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 ""
+#~ "Aufruf: dselect [Optionen]\n"
+#~ "        dselect [Optionen] Aktion ...\n"
+#~ "Optionen:  --admindir <Verzeichnis>  (Voreinstellung ist /var/lib/dpkg)\n"
+#~ "           --help  --version  --licence  --expert  --debug <Datei> | -"
+#~ "D<Datei>\n"
+#~ "           --colour bildteil:[vordergrund],[hintergrund][:attr[+attr"
+#~ "+..]]\n"
+#~ "Aktionen:  access update select install config remove quit menu\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.  Dies ist freie Software; Nutzungs-\n"
+#~ "Konditionen können in der GNU General Public Licence Version 2 oder "
+#~ "später\n"
+#~ "nachgelesen werden.\n"
+#~ "Es wird KEINE Haftung übernommen. Siehe auch dpkg-split --licence für "
+#~ "Details.\n"
+
 #~ msgid "Type md5sum --help for help."
 #~ msgstr "Geben Sie md5sum --help ein, um Hilfe zu erhalten."
 

po/dpkg.pot

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2006-01-23 19:31+0100\n"
+"POT-Creation-Date: 2006-02-06 23:10+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"
@@ -1992,116 +1992,115 @@ msgid "failed to exec rm for cleanup"
 msgstr ""
 
 #: src/main.c:44
-msgid "Debian GNU/Linux `"
-msgstr ""
-
-#: src/main.c:46
-msgid "' package management program version "
+#, c-format
+msgid "Debian `%s' package management program version %s.\n"
 msgstr ""
 
-#: 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
+#, 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 "
-msgstr ""
-
-#: src/main.c:50 src/query.c:465
-msgid " --licence for copyright and license details.\n"
+"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 ""
 
-#: src/main.c:58
+#: src/main.c:57
 #, 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 ""
 
-#: src/main.c:119
+#: src/main.c:121
 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 "
 "`more' !"
 msgstr ""
 
-#: 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 ""
 
-#: src/main.c:189
+#: src/main.c:191
 #, c-format
 msgid "Warning: obsolete option `--%s'\n"
 msgstr ""
 
-#: src/main.c:197
+#: src/main.c:199
 #, c-format
 msgid ""
 "%s debugging option, --debug=<octal> or -D<octal>:\n"
@@ -2122,26 +2121,26 @@ msgid ""
 "Note that the meanings and values are subject to change.\n"
 msgstr ""
 
-#: src/main.c:216
+#: src/main.c:218
 msgid "--debug requires an octal argument"
 msgstr ""
 
-#: src/main.c:240
+#: src/main.c:242
 #, c-format
 msgid "null package name in --ignore-depends comma-separated list `%.250s'"
 msgstr ""
 
-#: src/main.c:246
+#: src/main.c:248
 #, c-format
 msgid "--ignore-depends requires a legal package name. `%.250s' is not; %s"
 msgstr ""
 
-#: 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 ""
 
-#: src/main.c:292
+#: src/main.c:294
 #, c-format
 msgid ""
 "%s forcing options - control behaviour when problems found:\n"
@@ -2182,48 +2181,48 @@ msgid ""
 "Forcing options marked [*] are enabled by default.\n"
 msgstr ""
 
-#: src/main.c:337
+#: src/main.c:339
 #, c-format
 msgid "unknown force/refuse option `%.*s'"
 msgstr ""
 
-#: src/main.c:442 src/main.c:446
+#: src/main.c:444 src/main.c:448
 msgid "couldn't malloc in execbackend"
 msgstr ""
 
-#: src/main.c:444 src/main.c:451
+#: src/main.c:446 src/main.c:453
 msgid "couldn't strdup in execbackend"
 msgstr ""
 
-#: src/main.c:455
+#: src/main.c:457
 #, c-format
 msgid "failed to exec %s"
 msgstr ""
 
-#: src/main.c:467
+#: src/main.c:469
 msgid "--command-fd takes 1 argument, not 0"
 msgstr ""
 
-#: src/main.c:468
+#: src/main.c:470
 msgid "--command-fd only takes 1 argument"
 msgstr ""
 
-#: src/main.c:470
+#: src/main.c:472
 msgid "invalid number for --command-fd"
 msgstr ""
 
-#: src/main.c:472
+#: src/main.c:474
 #, c-format
 msgid "couldn't open `%i' for stream"
 msgstr ""
 
-#: src/main.c:497
+#: src/main.c:499
 #, c-format
 msgid "unexpected eof before end of line %d"
 msgstr ""
 
-#: 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 ""
 
@@ -2591,37 +2590,36 @@ msgid ""
 "and dpkg --contents (= dpkg-deb --contents) to list their contents.\n"
 msgstr ""
 
-#: src/query.c:459 dpkg-deb/main.c:46
-msgid "Debian `"
-msgstr ""
-
-#: src/query.c:461
-msgid "' package management program query tool\n"
-msgstr ""
-
-#: src/query.c:473
+#: src/query.c:459
 #, c-format
-msgid "Usage: "
+msgid "Debian `%s' package management program query tool\n"
 msgstr ""
 
-#: src/query.c:474
+#: src/query.c:472
 #, 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"
+msgstr ""
+
+#: 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"
@@ -2630,13 +2628,13 @@ msgid ""
 "width]}\n"
 "  syntax. Fields will be right-aligned unless the width is negative in "
 "which\n"
-"   case left aligenment will be used. \n"
+"  case left alignment will be used.\n"
 msgstr ""
 
 #: src/query.c:501
 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 ""
 
@@ -3451,90 +3449,96 @@ msgstr ""
 
 #: dselect/main.cc:150
 #, c-format
-msgid "Debian `%s' package handling frontend."
+msgid "Debian `%s' package handling frontend version %s.\n"
 msgstr ""
 
 #: 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 ""
 
-#: 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"
+"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:177
+#: dselect/main.cc:187
 #, c-format
 msgid "Screenparts:\n"
 msgstr ""
 
-#: dselect/main.cc:182
+#: dselect/main.cc:192
 #, c-format
 msgid "Colours:\n"
 msgstr ""
 
-#: dselect/main.cc:187
+#: dselect/main.cc:197
 #, c-format
 msgid "Attributes:\n"
 msgstr ""
 
-#: dselect/main.cc:207
+#: dselect/main.cc:217
 #, c-format
 msgid "couldn't open debug file `%.255s'\n"
 msgstr ""
 
-#: dselect/main.cc:222
+#: dselect/main.cc:232
 #, c-format
 msgid "Invalid %s `%s'\n"
 msgstr ""
 
-#: dselect/main.cc:239
+#: dselect/main.cc:249
 msgid "screen part"
 msgstr ""
 
-#: dselect/main.cc:245
+#: dselect/main.cc:255
 msgid "Null colour specification\n"
 msgstr ""
 
-#: dselect/main.cc:253 dselect/main.cc:258
+#: dselect/main.cc:263 dselect/main.cc:268
 msgid "colour"
 msgstr ""
 
-#: dselect/main.cc:266
+#: dselect/main.cc:276
 msgid "colour attribute"
 msgstr ""
 
-#: dselect/main.cc:300
+#: dselect/main.cc:310
 msgid "Terminal does not appear to support cursor addressing.\n"
 msgstr ""
 
-#: dselect/main.cc:302
+#: dselect/main.cc:312
 msgid "Terminal does not appear to support highlighting.\n"
 msgstr ""
 
-#: dselect/main.cc:303
+#: dselect/main.cc:314
+#, 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 ""
 
-#: dselect/main.cc:306
+#: dselect/main.cc:317
 msgid "terminal lacks necessary features, giving up"
 msgstr ""
 
-#: dselect/main.cc:384
+#: dselect/main.cc:395
 msgid ""
 "\n"
 "\n"
@@ -3543,18 +3547,18 @@ msgid ""
 "\n"
 msgstr ""
 
-#: dselect/main.cc:398
+#: dselect/main.cc:410
 msgid ""
 "\n"
 "\n"
 "Read-only access: only preview of selections is available!"
 msgstr ""
 
-#: dselect/main.cc:417
+#: dselect/main.cc:429
 msgid "failed to getch in main menu"
 msgstr ""
 
-#: dselect/main.cc:490
+#: dselect/main.cc:502
 #, c-format
 msgid "unknown action string `%.50s'"
 msgstr ""
@@ -4747,68 +4751,62 @@ msgstr ""
 msgid "--contents takes exactly one argument"
 msgstr ""
 
-#: dpkg-deb/main.c:48
-msgid "' package archive backend version "
-msgstr ""
-
-#: 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"
+#: dpkg-deb/main.c:46
+#, c-format
+msgid "Debian `%s' package archive backend version %s.\n"
 msgstr ""
 
-#: dpkg-deb/main.c:58
+#: dpkg-deb/main.c:56
+#, 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"
+msgstr ""
+
+#: 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:100
+#: 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."
 msgstr ""
 
-#: dpkg-deb/main.c:176
+#: dpkg-deb/main.c:181
 #, c-format
 msgid "unknown compression type `%s'!"
 msgstr ""
@@ -4957,66 +4955,68 @@ msgstr ""
 msgid "part %d is missing"
 msgstr ""
 
-#: dpkg-split/main.c:39
-msgid "Debian GNU/Linux `dpkg-split' package split/join tool; version "
+#: dpkg-split/main.c:38
+#, c-format
+msgid "Debian `%s' package split/join tool; version %s.\n"
 msgstr ""
 
-#: 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 ""
 
-#: dpkg-split/main.c:48
+#: dpkg-split/main.c:49
 #, 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"
+"Usage: %s [<option> ...] <command>\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"
+"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:  --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"
+"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 ""
 
-#: dpkg-split/main.c:69
+#: dpkg-split/main.c:75
 msgid "Type dpkg-split --help for help."
 msgstr ""
 
-#: dpkg-split/main.c:79
+#: dpkg-split/main.c:85
 #, c-format
 msgid "error reading %s"
 msgstr ""
 
-#: dpkg-split/main.c:83
+#: dpkg-split/main.c:89
 #, c-format
 msgid "error reading %.250s"
 msgstr ""
 
-#: dpkg-split/main.c:84
+#: dpkg-split/main.c:90
 #, c-format
 msgid "unexpected end of file in %.250s"
 msgstr ""
 
-#: dpkg-split/main.c:104
+#: dpkg-split/main.c:110
 msgid "part size is far too large or is not positive"
 msgstr ""
 
-#: 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 ""

po/el.po

@@ -13,7 +13,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dpkg_po_el\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: 2005-12-22 23:26+0200\n"
 "Last-Translator: quad-nrg.net <galaxico@quad-nrg.net>\n"
 "Language-Team: Greek <debian-l10n-greek@lists.debian.org>\n"
@@ -2162,91 +2162,90 @@ msgid "failed to exec rm for cleanup"
 msgstr "σφάλμα κατά την διαγραφή κατά τον τερματισμό"
 
 #: 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 "' έκδοση προγράμματος διαχείρισης πακέτων "
 
-#: 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 ""
 "Αυτό είναι ελεύθερο λογισμικό. Δείτε την GNU General Public Licence έκδοσης "
 "2 ή\n"
-"μεταγενέστερη για συνθήκες αντιγραφής.  Δεν υπάρχει ΚΑΜΙΑ εγγύηση.\n"
-"Δείτε "
-
-#: src/main.c:50 src/query.c:465
-msgid " --licence for copyright and license details.\n"
-msgstr " --licence για λεπτομέρειες πνευματικών δικαιωμάτων και άδειας.\n"
+"μεταγενέστερης για συνθήκες αντιγραφής. Δεν υπάρχει ΚΑΜΙΑ εγγύηση.\n"
+"Δείτε dpkg-deb --licence για λεπτομέρειες.\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 ""
@@ -2320,14 +2319,15 @@ msgstr ""
 "\n"
 "Χρησιμοποιήστε το `dselect' ή το 'aptitude' για φιλική διαχείριση πακέτων.\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 "
@@ -2343,17 +2343,17 @@ msgstr ""
 "Οι επιλογές με [*] εμφανίζουν αρκετό περιεχόμενο - χρησιμοποιήστε μια "
 "σωλήνωση με τις εντολές `less' ή `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 "συγκρουόμενες δράσεις --%s και --%s"
 
-#: src/main.c:189
+#: src/main.c:191
 #, c-format
 msgid "Warning: obsolete option `--%s'\n"
 msgstr "Προειδοποίηση: επιλογή εκτός χρήσης `--%s'\n"
 
-#: src/main.c:197
+#: src/main.c:199
 #, c-format
 msgid ""
 "%s debugging option, --debug=<octal> or -D<octal>:\n"
@@ -2393,30 +2393,30 @@ msgstr ""
 "άλγεβρα).\n"
 "Σημειώστε ότι οι εξηγήσεις και οι τιμές πιθανόν να αλλάξουν.\n"
 
-#: src/main.c:216
+#: src/main.c:218
 msgid "--debug requires an octal argument"
 msgstr "--debug απαιτεί ένα οκταδικό όρισμα"
 
-#: src/main.c:240
+#: src/main.c:242
 #, c-format
 msgid "null package name in --ignore-depends comma-separated list `%.250s'"
 msgstr ""
 "μη ορισμένο όνομα πακέτου στην χωρισμένη με κόμμα λίστα της --ignore-"
 "depends  `%.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 απαιτεί ένα έγκυρο όνομα πακέτου. Το `%.250s' δεν είναι. %"
 "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 "μη έγκυρος ακέραιος για --%s: `%.250s'"
 
-#: src/main.c:292
+#: src/main.c:294
 #, c-format
 msgid ""
 "%s forcing options - control behaviour when problems found:\n"
@@ -2501,48 +2501,48 @@ msgstr ""
 "για το σύστημά σας. Ο εξαναγκασμός των επιλογών με σήμανση [*] είναι εξ'\n"
 "ορισμού ενεργοποιημένος.\n"
 
-#: src/main.c:337
+#: src/main.c:339
 #, c-format
 msgid "unknown force/refuse option `%.*s'"
 msgstr "άγνωστη επιλογή force/refuse `%.*s'"
 
-#: src/main.c:442 src/main.c:446
+#: src/main.c:444 src/main.c:448
 msgid "couldn't malloc in execbackend"
 msgstr "αδύνατη η δέσμευση μνήμης με τη malloc στο execbackend"
 
-#: src/main.c:444 src/main.c:451
+#: src/main.c:446 src/main.c:453
 msgid "couldn't strdup in execbackend"
 msgstr "αδύνατη η αντιγραφή συμβολοσειράς με τη strdup στο execbackend"
 
-#: src/main.c:455
+#: src/main.c:457
 #, c-format
 msgid "failed to exec %s"
 msgstr "αδύνατη η εκτέλεση του %s"
 
-#: src/main.c:467
+#: src/main.c:469
 msgid "--command-fd takes 1 argument, not 0"
 msgstr "η --command-fd παίρνει 1 όρισμα, όχι 0"
 
-#: src/main.c:468
+#: src/main.c:470
 msgid "--command-fd only takes 1 argument"
 msgstr "--command-fd παίρνει μόνο 1 όρισμα"
 
-#: src/main.c:470
+#: src/main.c:472
 msgid "invalid number for --command-fd"
 msgstr "μη έγκυρος αριθμός για το --command-fd"
 
-#: src/main.c:472
+#: src/main.c:474
 #, c-format
 msgid "couldn't open `%i' for stream"
 msgstr "αδύνατο το άνοιγμα του `%i' ως ροή (stream)"
 
-#: src/main.c:497
+#: src/main.c:499
 #, c-format
 msgid "unexpected eof before end of line %d"
 msgstr "απρόσμενο eof πριν το τέλος της γραμμής %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 "χρειάζεται μια επιλογή ενέργειας"
 
@@ -2942,46 +2942,31 @@ msgstr ""
 "και dpkg --contents (= dpkg-deb --contents) για προβολή των περιεχομένων "
 "τους.\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 "' εργαλείο πληροφόρησης προγράμματος διαχείρισης πακέτων\n"
 
-#: src/query.c:473
-#, c-format
-msgid "Usage: "
-msgstr "Χρήση: "
-
-#: 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 ""
 " [<επιλογή>] <εντολή>\n"
 "Εντολές:\n"
@@ -3011,10 +2996,25 @@ msgstr ""
 "στοίχιση.\n"
 " \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 ""
 "Δώστε --help για βοήθεια σχετικά με πληροφόρηση πακέτων;\n"
@@ -4075,107 +4075,99 @@ msgid "menu"
 msgstr "μενού"
 
 #: 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'"
 
 #: 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 ""
-"Έκδοση %s.\n"
-"Πνευματικά δικαιώματα (C) 1994-1996 Ian Jackson.\n"
-"Πνευματικά δικαιώματα (C) 2000,2001 Wichert Akkerman.\n"
-"Αυτό είναι ελεύθερο λογισμικό. Δείτε την GNU General Public Licence έκδοσης "
-"2\n"
-"ή επόμενης για συνθήκες αντιγραφής.  Δεν υπάρχει ΚΑΜΙΑ εγγύηση.  Δείτε\n"
-"dselect --licence για λεπτομέρειες.\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 ""
-"Χρήση: dselect [επιλογές]\n"
-"       dselect [επιλογές] δράση ...\n"
-"Επιλογές:  --admindir <directory>  (default is /var/lib/dpkg)\n"
-"           --help  --version  --licence  --expert  --debug <file> | -"
-"D<file>\n"
-"           --colour screenpart:[foreground],[background][:attr[+attr+..]]\n"
-"Δράσεις:  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 "Οθόνες:\n"
 
-#: dselect/main.cc:182
+#: dselect/main.cc:192
 #, c-format
 msgid "Colours:\n"
 msgstr "Χρώματα:\n"
 
-#: dselect/main.cc:187
+#: dselect/main.cc:197
 #, c-format
 msgid "Attributes:\n"
 msgstr "Ιδιότητες:\n"
 
-#: dselect/main.cc:207
+#: dselect/main.cc:217
 #, c-format
 msgid "couldn't open debug file `%.255s'\n"
 msgstr "αδύνατο το άνοιγμα του αρχείου debug `%.255s'\n"
 
-#: dselect/main.cc:222
+#: dselect/main.cc:232
 #, c-format
 msgid "Invalid %s `%s'\n"
 msgstr "Μη έγκυρο %s `%s'\n"
 
-#: dselect/main.cc:239
+#: dselect/main.cc:249
 msgid "screen part"
 msgstr "τμήμα οθόνης"
 
-#: dselect/main.cc:245
+#: dselect/main.cc:255
 msgid "Null colour specification\n"
 msgstr "κενός χρωματικός προσδιορισμός\n"
 
-#: dselect/main.cc:253 dselect/main.cc:258
+#: dselect/main.cc:263 dselect/main.cc:268
 msgid "colour"
 msgstr "χρώμα"
 
-#: dselect/main.cc:266
+#: dselect/main.cc:276
 msgid "colour attribute"
 msgstr "ιδιότητα χρώματος"
 
-#: dselect/main.cc:300
+#: dselect/main.cc:310
 msgid "Terminal does not appear to support cursor addressing.\n"
 msgstr "Το τερματικό δεν φαίνεται να υποστηρίζει κατευθυνόμενο δρομέα.\n"
 
-#: dselect/main.cc:302
+#: dselect/main.cc:312
 msgid "Terminal does not appear to support highlighting.\n"
 msgstr "Το τερματικό δεν φαίνεται να υποστηρίζει τονισμό.\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 ""
 "Ορίστε τη μεταβλητή TERM σωστά, χρησιμοποιήστε ένα καλύτερο τερματικό,\n"
 "ή χρησιμοποιήστε με το εργαλείο διαχείρισης μεμονωμένων πακέτων "
 
-#: dselect/main.cc:306
+#: dselect/main.cc:317
 msgid "terminal lacks necessary features, giving up"
 msgstr "το τερματικό δεν υποστηρίζει απαραίτητα χαρακτηριστικά, εγκατάλειψη"
 
-#: dselect/main.cc:384
+#: dselect/main.cc:395
 msgid ""
 "\n"
 "\n"
@@ -4189,7 +4181,7 @@ msgstr ""
 "Πιέστε <enter> για αποδοχή της επιλογής.   το ^L ανανεώνει την οθόνη.\n"
 "\n"
 
-#: dselect/main.cc:398
+#: dselect/main.cc:410
 msgid ""
 "\n"
 "\n"
@@ -4200,11 +4192,11 @@ msgstr ""
 "Πρόσβαση μόνο για ανάγνωση: Μόνο η προεπισκόπηση των επιλογών είναι "
 "διαθέσιμη!"
 
-#: dselect/main.cc:417
+#: dselect/main.cc:429
 msgid "failed to getch in main menu"
 msgstr "απέτυχε η getch στο κυρίως μενού"
 
-#: dselect/main.cc:490
+#: dselect/main.cc:502
 #, c-format
 msgid "unknown action string `%.50s'"
 msgstr "άγνωστη συμβολοσειρά δράσης `%.50s'"
@@ -5439,63 +5431,44 @@ msgstr "Σφάλμα στη μορφοποίηση"
 msgid "--contents takes exactly one argument"
 msgstr "η --contents παίρνει μόνο ένα όρισμα"
 
-#: 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 " έκδοση υποδομής αρχειοθήκης πακέτου"
 
-#: dpkg-deb/main.c:50
+#: dpkg-deb/main.c:56
+#, 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 dpkg-deb --licence for details.\n"
-msgstr ""
-"Αυτό είναι ελεύθερο λογισμικό. Δείτε την GNU General Public Licence έκδοσης "
-"2 ή\n"
-"μεταγενέστερης για συνθήκες αντιγραφής. Δεν υπάρχει ΚΑΜΙΑ εγγύηση.\n"
-"Δείτε dpkg-deb --licence για λεπτομέρειες.\n"
-
-#: dpkg-deb/main.c:58
-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 ""
 "Εντολή:\n"
 "  -b|--build <κατάλογος> [<deb>]    δημιουργία αρχειοθήκης.\n"
@@ -5541,7 +5514,16 @@ msgstr ""
 "που αποσυμπιέζονται\n"
 "με την εντολή `dpkg-deb --extract' δε θα εγκατασταθούν σωστά!\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."
@@ -5550,7 +5532,7 @@ msgstr ""
 "*.deb. Πληκτρολογήστε dpkg --help για βοήθεια σχετικά με εγκατάσταση και\n"
 "απεγκατάσταση πακέτων."
 
-#: dpkg-deb/main.c:176
+#: dpkg-deb/main.c:181
 #, c-format
 msgid "unknown compression type `%s'!"
 msgstr "άγνωστος τύπος συμπίεσης '%s'!"
@@ -5727,43 +5709,41 @@ msgstr "η --join απαιτεί ένα ή περισσότερα αρχεία
 msgid "part %d is missing"
 msgstr "λείπει το κομμάτι %d"
 
-#: 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' εργαλείο χωρισμού ένωσης πακέτων. Έκδοση  "
 
-#: 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 ""
-"Πνευματικά Δικαιώματα (C) 1994-1996 Ian Jackson.  Αυτό είναι ελεύθερο\n"
-"λογισμικό. Δείτε την GNU General Public Licence έκδοσης 2 ή μεταγενέστερη\n"
-"για συνθήκες αντιγραφής.\n"
-"Δεν υπάρχει ΚΑΜΙΑ εγγύηση. Δείτε dpkg-split --licence για λεπτομέρειες.\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 ""
@@ -5785,30 +5765,30 @@ msgstr ""
 "\n"
 "Κατάσταση εξόδου: 0 = OK;  1 = το -a δεν είναι τμήμα;  2 = πρόβλημα!\n"
 
-#: dpkg-split/main.c:69
+#: dpkg-split/main.c:75
 msgid "Type dpkg-split --help for help."
 msgstr "Δώστε dpkg-split --help για βοήθεια."
 
-#: dpkg-split/main.c:79
+#: dpkg-split/main.c:85
 #, c-format
 msgid "error reading %s"
 msgstr "σφάλμα κατά την ανάγνωση %s"
 
-#: dpkg-split/main.c:83
+#: dpkg-split/main.c:89
 #, c-format
 msgid "error reading %.250s"
 msgstr "σφάλμα κατά την ανάγνωση %.250s"
 
-#: dpkg-split/main.c:84
+#: dpkg-split/main.c:90
 #, c-format
 msgid "unexpected end of file in %.250s"
 msgstr "απρόσμενο τέλος αρχείου στο %.250s"
 
-#: dpkg-split/main.c:104
+#: dpkg-split/main.c:110
 msgid "part size is far too large or is not positive"
 msgstr "το μέγεθος του τμήματος είναι πολύ μεγάλο ή μη θετικό"
 
-#: 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 ""
@@ -5944,3 +5924,70 @@ msgstr "το αρχείο πηγής `%.250s' δεν είναι κοινό αρ
 #: dpkg-split/split.c:70
 msgid "unable to exec mksplit"
 msgstr "αδύνατη η εκτέλεση της 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 ""
+#~ "Αυτό είναι ελεύθερο λογισμικό. Δείτε την GNU General Public Licence "
+#~ "έκδοσης 2 ή\n"
+#~ "μεταγενέστερη για συνθήκες αντιγραφής.  Δεν υπάρχει ΚΑΜΙΑ εγγύηση.\n"
+#~ "Δείτε "
+
+#~ msgid " --licence for copyright and license details.\n"
+#~ msgstr " --licence για λεπτομέρειες πνευματικών δικαιωμάτων και άδειας.\n"
+
+#~ msgid "Debian `"
+#~ msgstr "Debian `"
+
+#~ msgid "Usage: "
+#~ msgstr "Χρήση: "
+
+#~ 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 ""
+#~ "Έκδοση %s.\n"
+#~ "Πνευματικά δικαιώματα (C) 1994-1996 Ian Jackson.\n"
+#~ "Πνευματικά δικαιώματα (C) 2000,2001 Wichert Akkerman.\n"
+#~ "Αυτό είναι ελεύθερο λογισμικό. Δείτε την GNU General Public Licence "
+#~ "έκδοσης 2\n"
+#~ "ή επόμενης για συνθήκες αντιγραφής.  Δεν υπάρχει ΚΑΜΙΑ εγγύηση.  Δείτε\n"
+#~ "dselect --licence για λεπτομέρειες.\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 ""
+#~ "Χρήση: dselect [επιλογές]\n"
+#~ "       dselect [επιλογές] δράση ...\n"
+#~ "Επιλογές:  --admindir <directory>  (default is /var/lib/dpkg)\n"
+#~ "           --help  --version  --licence  --expert  --debug <file> | -"
+#~ "D<file>\n"
+#~ "           --colour screenpart:[foreground],[background][:attr[+attr"
+#~ "+..]]\n"
+#~ "Δράσεις:  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 ""
+#~ "Πνευματικά Δικαιώματα (C) 1994-1996 Ian Jackson.  Αυτό είναι ελεύθερο\n"
+#~ "λογισμικό. Δείτε την GNU General Public Licence έκδοσης 2 ή "
+#~ "μεταγενέστερη\n"
+#~ "για συνθήκες αντιγραφής.\n"
+#~ "Δεν υπάρχει ΚΑΜΙΑ εγγύηση. Δείτε dpkg-split --licence για λεπτομέρειες.\n"

po/es.po

@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Debian dpkg 1.10.18\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: 2005-08-23 09:55+0200\n"
 "Last-Translator: Javier Fernández-Sanguino <jfs@debian.org>\n"
 "Language-Team: Spanish <debian-l10n-spanish@lists.debian.org>\n"
@@ -2213,96 +2213,92 @@ msgstr "fallo al efectuar `rmdir/unlink' sobre `%.255s'"
 msgid "failed to exec rm for cleanup"
 msgstr "fallo al ejecutar rm para limpieza"
 
-# FIXME: This is difficult to translate. Suggest using %s. sv
 #: src/main.c:44
-msgid "Debian GNU/Linux `"
-msgstr "Administrador de paquetes `"
-
-#: src/main.c:46
-msgid "' package management program version "
+#, fuzzy, c-format
+msgid "Debian `%s' package management program version %s.\n"
 msgstr "' de Debian GNU/Linux, versión "
 
-# This split is broken. It should say "See %s --licence for copyright" instead.
-# We do not translate words, we translate complete sentences. sv
-#: 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 ""
 "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"
-"Vea "
-
-#: src/main.c:50 src/query.c:465
-msgid " --licence for copyright and license details.\n"
-msgstr " --license para ver el copyright y más detalles sobre la licencia.\n"
+"Véase dpkg-deb --license para más detalles.\n"
 
 # FUZZY.
 # FIXME: Extra space in Usage: line.
-#: 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 ""
@@ -2394,14 +2390,15 @@ msgstr ""
 "\n"
 "Utilice `dselect' o 'aptitude' para una gestión de paquetes más amigable.\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 "
@@ -2419,17 +2416,17 @@ msgstr ""
 "Las opciones marcadas con ([*]) producen una salida extensa,\n"
 "¡fíltrela con `less' o con `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 "acciones en conflicto --%s y --%s"
 
-#: src/main.c:189
+#: src/main.c:191
 #, c-format
 msgid "Warning: obsolete option `--%s'\n"
 msgstr "Atención: opción obsoleta `--%s'\n"
 
-#: src/main.c:197
+#: src/main.c:199
 #, c-format
 msgid ""
 "%s debugging option, --debug=<octal> or -D<octal>:\n"
@@ -2467,30 +2464,30 @@ msgstr ""
 "Las opciones de depuración se mezclan haciendo el OR bit por bit.\n"
 "Note que los significados y los valores están sujetos a cambios.\n"
 
-#: src/main.c:216
+#: src/main.c:218
 msgid "--debug requires an octal argument"
 msgstr "--debug necesita un número octal como parámetro"
 
-#: src/main.c:240
+#: src/main.c:242
 #, c-format
 msgid "null package name in --ignore-depends comma-separated list `%.250s'"
 msgstr ""
 "nombre de paquete vacío en la lista de --ignore-depends separados por coma `"
 "%.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 necesita un nombre de paquete legal.\n"
 "`%.250s' no lo es; %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 "entero inválido para --%s: `%.250s'"
 
-#: src/main.c:292
+#: src/main.c:294
 #, c-format
 msgid ""
 "%s forcing options - control behaviour when problems found:\n"
@@ -2583,48 +2580,48 @@ msgstr ""
 "la instalación. Las opciones de forzado marcadas con [*] están activadas\n"
 "por omisión.\n"
 
-#: src/main.c:337
+#: src/main.c:339
 #, c-format
 msgid "unknown force/refuse option `%.*s'"
 msgstr "opción force/refuse desconocida `%.*s'"
 
-#: src/main.c:442 src/main.c:446
+#: src/main.c:444 src/main.c:448
 msgid "couldn't malloc in execbackend"
 msgstr "no se pudo ejecutar malloc en execbackend"
 
-#: src/main.c:444 src/main.c:451
+#: src/main.c:446 src/main.c:453
 msgid "couldn't strdup in execbackend"
 msgstr "no se pudo ejecutar strdup en execbackend"
 
-#: src/main.c:455
+#: src/main.c:457
 #, c-format
 msgid "failed to exec %s"
 msgstr "fallo al ejecutar %s"
 
-#: src/main.c:467
+#: src/main.c:469
 msgid "--command-fd takes 1 argument, not 0"
 msgstr "--command-fd toma 1 argumento, no 0"
 
-#: src/main.c:468
+#: src/main.c:470
 msgid "--command-fd only takes 1 argument"
 msgstr "--command-fd sólo toma 1 argumento"
 
-#: src/main.c:470
+#: src/main.c:472
 msgid "invalid number for --command-fd"
 msgstr "número inválido para --command-fd"
 
-#: src/main.c:472
+#: src/main.c:474
 #, c-format
 msgid "couldn't open `%i' for stream"
 msgstr "no se pudo abrir `%i' para un flujo"
 
-#: src/main.c:497
+#: src/main.c:499
 #, c-format
 msgid "unexpected eof before end of line %d"
 msgstr "eof inesperado antes del fin de la línea %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 "se necesita una opción de acción"
 
@@ -3027,48 +3024,31 @@ msgstr ""
 "Utilice dpkg --info (= dpkg-deb --info) para examinar archivos,\n"
 "y dpkg --contents (= dpkg-deb --contents) para listar su contenido.\n"
 
-# This is broken. Translators do not translate words, they translate complete sentences.
-# I would suggest using %s. sv
-#: src/query.c:459 dpkg-deb/main.c:46
-msgid "Debian `"
-msgstr "Herramienta de consulta `"
-
-#: 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 "' del gestor de paquetes de Debian\n"
 
-#: src/query.c:473
-#, c-format
-msgid "Usage: "
-msgstr "Modo de empleo: "
-
-#: 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 ""
 " [<opción>] <orden>\n"
 "Órdenes:\n"
@@ -3103,10 +3083,25 @@ msgstr ""
 "  menos que el ancho sea negativo, en cuyo caso se alinearán a la "
 "izquierda.\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 ""
 "Utilice --help para obtener ayuda sobre consulta de paquetes;\n"
@@ -4187,106 +4182,99 @@ msgid "menu"
 msgstr "menú"
 
 #: 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 "Interfaz de manejo de paquetes `%s' de Debian."
 
 #: 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 ""
-"Versión %s.\n"
-"Copyright (C) 1994-1996 Ian Jackson.\n"
-"Copyright (C) 2000,2001 Wichert Akkerman.\n"
-"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"
-"Vea dselect --license para más detalles.\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 ""
-"Modo de empleo: dselect [opciones]\n"
-"                dselect [opciones] acción ...\n"
-"Opciones: --admindir <directorio>  (por omisión es /var/lib/dpkg)\n"
-"          --help --version --licence --expert --debug <fichero> | -"
-"D<fichero>\n"
-"          --colour partedepantalla:[primerplano],[fondo][:atr[+atr+..]]\n"
-"Acciones:  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 "Partes de pantalla:\n"
 
-#: dselect/main.cc:182
+#: dselect/main.cc:192
 #, c-format
 msgid "Colours:\n"
 msgstr "Colores:\n"
 
-#: dselect/main.cc:187
+#: dselect/main.cc:197
 #, c-format
 msgid "Attributes:\n"
 msgstr "Atributos:\n"
 
-#: dselect/main.cc:207
+#: dselect/main.cc:217
 #, 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:222
+#: dselect/main.cc:232
 #, c-format
 msgid "Invalid %s `%s'\n"
 msgstr "%s inválido `%s'\n"
 
-#: dselect/main.cc:239
+#: dselect/main.cc:249
 msgid "screen part"
 msgstr "parte de pantalla"
 
-#: dselect/main.cc:245
+#: dselect/main.cc:255
 msgid "Null colour specification\n"
 msgstr "Especificación de color nula\n"
 
-#: dselect/main.cc:253 dselect/main.cc:258
+#: dselect/main.cc:263 dselect/main.cc:268
 msgid "colour"
 msgstr "color"
 
-#: dselect/main.cc:266
+#: dselect/main.cc:276
 msgid "colour attribute"
 msgstr "atributo de color"
 
-#: dselect/main.cc:300
+#: dselect/main.cc:310
 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:302
+#: dselect/main.cc:312
 msgid "Terminal does not appear to support highlighting.\n"
 msgstr "El terminal parece no dar soporte al destacado.\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 ""
 "Establezca la variable TERM correctamente, utilice un terminal mejor,\n"
 "o realice la construcción con la herramienta de gestión por paquete "
 
-#: dselect/main.cc:306
+#: dselect/main.cc:317
 msgid "terminal lacks necessary features, giving up"
 msgstr "el terminal carece de propiedades necesarias: abandonando"
 
-#: dselect/main.cc:384
+#: dselect/main.cc:395
 msgid ""
 "\n"
 "\n"
@@ -4300,7 +4288,7 @@ msgstr ""
 "Pulse <intro> para confirmar la selección.  ^L redibuja la pantalla.\n"
 "\n"
 
-#: dselect/main.cc:398
+#: dselect/main.cc:410
 msgid ""
 "\n"
 "\n"
@@ -4310,11 +4298,11 @@ msgstr ""
 "\n"
 "Acceso de sólo lectura: ¡solamente se pueden ver las selecciones!"
 
-#: dselect/main.cc:417
+#: dselect/main.cc:429
 msgid "failed to getch in main menu"
 msgstr "fallo en getch en el menú principal"
 
-#: dselect/main.cc:490
+#: dselect/main.cc:502
 #, c-format
 msgid "unknown action string `%.50s'"
 msgstr "cadena de acción desconocida `%.50s'"
@@ -5573,62 +5561,44 @@ msgid "--contents takes exactly one argument"
 msgstr "--contents toma exactamente un argumento"
 
 # Si alguien me da una buena traducción, lo cambio. sv
-#: 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 "' package archive backend versión "
 
-#: 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 ""
-"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"
-"Véase dpkg-deb --license para más detalles.\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"
-"\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"
+"  -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"
-"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 ""
 "Orden:\n"
 "  -b|--build <directorio> [<deb>]    construye un archivo.\n"
@@ -5678,7 +5648,16 @@ msgstr ""
 "paquetes desempaquetados usando `dpkg-deb --extract' se instalarán\n"
 "incorrectamente! \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."
@@ -5687,7 +5666,7 @@ msgstr ""
 "deb;\n"
 "Escriba dpkg --help para obtener ayuda sobre instalar y desinstalar paquetes."
 
-#: dpkg-deb/main.c:176
+#: dpkg-deb/main.c:181
 #, c-format
 msgid "unknown compression type `%s'!"
 msgstr "¡tipo de compresión «%s» desconocido!"
@@ -5864,43 +5843,41 @@ msgstr "--join requiere uno o m
 msgid "part %d is missing"
 msgstr "falta la parte %d"
 
-#: 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 ""
 "herramienta de división/unión `dpkg-split' de Debian GNU/Linux; versión "
 
-#: 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. Esto es software libre; vea la\n"
-"Licencia Pública General de GNU versión 2 o posterior para las condiciones\n"
-"de copia. No hay NINGUNA garantía. Vea dpkg-split --licence para más "
-"detalles.\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 ""
@@ -5927,30 +5904,30 @@ msgstr ""
 "\n"
 "Estado de salida: 0 = OK;  1 = -a no es una parte;  2 = ¡problemas!\n"
 
-#: dpkg-split/main.c:69
+#: dpkg-split/main.c:75
 msgid "Type dpkg-split --help for help."
 msgstr "Escriba dpkg-split --help para obtener ayuda."
 
-#: dpkg-split/main.c:79
+#: dpkg-split/main.c:85
 #, c-format
 msgid "error reading %s"
 msgstr "error al leer %s"
 
-#: dpkg-split/main.c:83
+#: dpkg-split/main.c:89
 #, c-format
 msgid "error reading %.250s"
 msgstr "error al leer %.250s"
 
-#: dpkg-split/main.c:84
+#: dpkg-split/main.c:90
 #, c-format
 msgid "unexpected end of file in %.250s"
 msgstr "fin de fichero inesperado en %.250s"
 
-#: dpkg-split/main.c:104
+#: dpkg-split/main.c:110
 msgid "part size is far too large or is not positive"
 msgstr "el tamaño de la parte es demasiado grande o no es positivo"
 
-#: 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 ""
@@ -6087,6 +6064,78 @@ msgstr "el fichero fuente `%.250s' no es un fichero normal"
 msgid "unable to exec mksplit"
 msgstr "no se puede ejecutar mksplit"
 
+# FIXME: This is difficult to translate. Suggest using %s. sv
+#~ msgid "Debian GNU/Linux `"
+#~ msgstr "Administrador de paquetes `"
+
+# This split is broken. It should say "See %s --licence for copyright" instead.
+# We do not translate words, we translate complete sentences. sv
+#~ 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 ""
+#~ "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"
+#~ "Vea "
+
+#~ msgid " --licence for copyright and license details.\n"
+#~ msgstr ""
+#~ " --license para ver el copyright y más detalles sobre la licencia.\n"
+
+# This is broken. Translators do not translate words, they translate complete sentences.
+# I would suggest using %s. sv
+#~ msgid "Debian `"
+#~ msgstr "Herramienta de consulta `"
+
+#~ msgid "Usage: "
+#~ msgstr "Modo de empleo: "
+
+#~ 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 ""
+#~ "Versión %s.\n"
+#~ "Copyright (C) 1994-1996 Ian Jackson.\n"
+#~ "Copyright (C) 2000,2001 Wichert Akkerman.\n"
+#~ "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"
+#~ "Vea dselect --license para más detalles.\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 ""
+#~ "Modo de empleo: dselect [opciones]\n"
+#~ "                dselect [opciones] acción ...\n"
+#~ "Opciones: --admindir <directorio>  (por omisión es /var/lib/dpkg)\n"
+#~ "          --help --version --licence --expert --debug <fichero> | -"
+#~ "D<fichero>\n"
+#~ "          --colour partedepantalla:[primerplano],[fondo][:atr[+atr+..]]\n"
+#~ "Acciones:  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. Esto es software libre; vea la\n"
+#~ "Licencia Pública General de GNU versión 2 o posterior para las "
+#~ "condiciones\n"
+#~ "de copia. No hay NINGUNA garantía. Vea dpkg-split --licence para más "
+#~ "detalles.\n"
+
 #~ msgid "Type md5sum --help for help."
 #~ msgstr "Escriba md5sum --help para obtener ayuda."
 

po/eu.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: eu\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: 2005-06-14 23:34+0200\n"
 "Last-Translator: Piarres Beobide\n"
 "Language-Team:  Librezale.org <librezale@librezale.org>\n"
@@ -2132,91 +2132,90 @@ msgid "failed to exec rm for cleanup"
 msgstr "huts egin du rm garbitzeko exekutatzean"
 
 #: 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 "' pakete-kudeaketako programaren bertsioa "
 
-#: 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 ""
 "Software hau librea da; kopiatzeko baldintzen berri izateko, ikus\n"
 "GNU Lizentzia Publiko Orokorraren 2 bertsioa edo berriagoa.\n"
 "EZ dago bermerik.\n"
-"Ikus "
-
-#: src/main.c:50 src/query.c:465
-msgid " --licence for copyright and license details.\n"
-msgstr " --licence copyright-ari eta lizentziari buruzko xehetasunetarako.\n"
+"Ikus dpkg-deb --licence xehetasun gehiago izateko.\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 ""
@@ -2310,14 +2309,15 @@ msgstr ""
 "Erabili `dselect' edo 'aptitude' pakete kudeaketa lagungarriago bat "
 "izateko.\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 "
@@ -2336,17 +2336,17 @@ msgstr ""
 "\n"
 " [*] duten aukerek irteera luze bat dute - `less' edo `more' bidez erabili!"
 
-#: 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 "ekintza gatazkatsuak --%s eta --%s"
 
-#: src/main.c:189
+#: src/main.c:191
 #, c-format
 msgid "Warning: obsolete option `--%s'\n"
 msgstr "Kontuz: aukera zaharkitua `--%s'\n"
 
-#: src/main.c:197
+#: src/main.c:199
 #, c-format
 msgid ""
 "%s debugging option, --debug=<octal> or -D<octal>:\n"
@@ -2385,27 +2385,27 @@ msgstr ""
 "Arazketa-aukerak OR logikoarekin konbina daitezke.\n"
 "Kontuan hartu esanahiak eta balioak alda daitezkeela.\n"
 
-#: src/main.c:216
+#: src/main.c:218
 msgid "--debug requires an octal argument"
 msgstr "--debug: octal argumentu bat behar du"
 
-#: src/main.c:240
+#: src/main.c:242
 #, c-format
 msgid "null package name in --ignore-depends comma-separated list `%.250s'"
 msgstr ""
 "pakete-izen nulua --ignore-depends komaz bereizitako `%.250s' zerrendan"
 
-#: 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: legezko pakete-izena behar du. `%.250s' ez da; %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 "baliogabeko osokoa --%s: `%.250s'"
 
-#: src/main.c:292
+#: src/main.c:294
 #, c-format
 msgid ""
 "%s forcing options - control behaviour when problems found:\n"
@@ -2485,48 +2485,48 @@ msgstr ""
 "dezake.\n"
 "[*] marka duten behartzeko aukerak gaituta daude lehenespenez.\n"
 
-#: src/main.c:337
+#: src/main.c:339
 #, c-format
 msgid "unknown force/refuse option `%.*s'"
 msgstr "`%.*s' behartzeko/uko egiteko aukera ezezaguna"
 
-#: src/main.c:442 src/main.c:446
+#: src/main.c:444 src/main.c:448
 msgid "couldn't malloc in execbackend"
 msgstr "ezin izan da malloc egin execbackend-en"
 
-#: src/main.c:444 src/main.c:451
+#: src/main.c:446 src/main.c:453
 msgid "couldn't strdup in execbackend"
 msgstr "ezin izan da strdup egin execbackend-en"
 
-#: src/main.c:455
+#: src/main.c:457
 #, c-format
 msgid "failed to exec %s"
 msgstr "huts egin du %s exekutatzean"
 
-#: src/main.c:467
+#: src/main.c:469
 msgid "--command-fd takes 1 argument, not 0"
 msgstr "--command-fd: argumentu 1 hartzen du, ez 0"
 
-#: src/main.c:468
+#: src/main.c:470
 msgid "--command-fd only takes 1 argument"
 msgstr "--command-fd: argumentu 1 bakarrik hartzen du"
 
-#: src/main.c:470
+#: src/main.c:472
 msgid "invalid number for --command-fd"
 msgstr "--command-fd: baliogabeko zenbakia"
 
-#: src/main.c:472
+#: src/main.c:474
 #, c-format
 msgid "couldn't open `%i' for stream"
 msgstr "ezin izan da `%i' ireki korronterako"
 
-#: src/main.c:497
+#: src/main.c:499
 #, c-format
 msgid "unexpected eof before end of line %d"
 msgstr "ustekabeko eof %d lerroa amaitu aurretik"
 
-#: 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 "ekintza-aukera bat behar da"
 
@@ -2920,46 +2920,31 @@ msgstr ""
 "Erabili dpkg --info (= dpkg-deb --info) artxibo-fitxategiak aztertzeko,\n"
 "eta dpkg --contents (= dpkg-deb --contents) edukia zerrendatzeko.\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 "' pakete-kudeaketako programaren kontsulta-tresna\n"
 
-#: src/query.c:473
-#, c-format
-msgid "Usage: "
-msgstr "Erabilera: "
-
-#: 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 ""
 " [<aukera>] <komandoa>\n"
 "Komandoak:\n"
@@ -2988,10 +2973,25 @@ msgstr ""
 "negatiboa ez deb bitartean\n"
 "   orduan ezkerretara lerrokatuko dira. \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 ""
 "Erabili --help paketeei buruzko kontsultak egiteko laguntza lortzeko;\n"
@@ -4033,109 +4033,99 @@ msgid "menu"
 msgstr "menua"
 
 #: 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-en paketeak kudeatzeko `%s' interfazea."
 
 #: 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 ""
-"%s bertsioa.\n"
-"Copyright (C) 1994-1996 Ian Jackson.\n"
-"Copyright (C) 2000,2001 Wichert Akkerman.\n"
-"Software hau librea da; kopiatzeko baldintzen berri izateko, ikus\n"
-"GNU Lizentzia Publiko Orokorraren 2 bertsioa edo berriagoa. EZ dago\n"
-"bermerik. Ikus dselect --licence xehetasun gehiago lortzeko.\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 ""
-"Erabilera: \n"
-"  dselect [aukerak]\n"
-"  dselect [aukerak] ekintza ...\n"
-"Aukerak: \n"
-"  --admindir <direktorioa>  (lehenetsia: /var/lib/dpkg)\n"
-"  --help  --version  --licence  --expert  --debug <fitxategia> | -"
-"D<fitxategia>\n"
-"  --colour pantaila-zatia:[aurreko planoa],[atzeko planoa][:atr[+atr+..]]\n"
-"Ekintzak:  \n"
+"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:177
+#: dselect/main.cc:187
 #, c-format
 msgid "Screenparts:\n"
 msgstr "Pantaila-zatiak:\n"
 
-#: dselect/main.cc:182
+#: dselect/main.cc:192
 #, c-format
 msgid "Colours:\n"
 msgstr "Koloreak:\n"
 
-#: dselect/main.cc:187
+#: dselect/main.cc:197
 #, c-format
 msgid "Attributes:\n"
 msgstr "Atributuak:\n"
 
-#: dselect/main.cc:207
+#: dselect/main.cc:217
 #, c-format
 msgid "couldn't open debug file `%.255s'\n"
 msgstr "ezin izan da `%.255s' arazketa-fitxategia ireki\n"
 
-#: dselect/main.cc:222
+#: dselect/main.cc:232
 #, c-format
 msgid "Invalid %s `%s'\n"
 msgstr "%s `%s' baliogabea\n"
 
-#: dselect/main.cc:239
+#: dselect/main.cc:249
 msgid "screen part"
 msgstr "pantaila-zatia"
 
-#: dselect/main.cc:245
+#: dselect/main.cc:255
 msgid "Null colour specification\n"
 msgstr "Kolore-zehaztapen nulua\n"
 
-#: dselect/main.cc:253 dselect/main.cc:258
+#: dselect/main.cc:263 dselect/main.cc:268
 msgid "colour"
 msgstr "kolorea"
 
-#: dselect/main.cc:266
+#: dselect/main.cc:276
 msgid "colour attribute"
 msgstr "kolore-atributua"
 
-#: dselect/main.cc:300
+#: dselect/main.cc:310
 msgid "Terminal does not appear to support cursor addressing.\n"
 msgstr "Badirudi terminalak ez duela onartzen kurtsore-helbideratzerik.\n"
 
-#: dselect/main.cc:302
+#: dselect/main.cc:312
 msgid "Terminal does not appear to support highlighting.\n"
 msgstr "Badirudi terminalak ez duela onartzen nabarmentzea.\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 ""
 "Ezarri ondo TERM aldagaia, erabili terminal hobe bat,\n"
 "edo moldatu paketez pakete kudeatzeko tresnarekin "
 
-#: dselect/main.cc:306
+#: dselect/main.cc:317
 msgid "terminal lacks necessary features, giving up"
 msgstr "terminalak beharrezko eginbide batzuk falta ditu, utzi egingo da"
 
-#: dselect/main.cc:384
+#: dselect/main.cc:395
 msgid ""
 "\n"
 "\n"
@@ -4150,7 +4140,7 @@ msgstr ""
 "Hautatzeko, sakatu <sartu>. Erabili ^L pantaila berriro marrazteko.\n"
 "\n"
 
-#: dselect/main.cc:398
+#: dselect/main.cc:410
 msgid ""
 "\n"
 "\n"
@@ -4160,11 +4150,11 @@ msgstr ""
 "\n"
 "Soilik irakurtzeko sarbidea: hautapenen aurrebista bakarrik dago erabilgarri!"
 
-#: dselect/main.cc:417
+#: dselect/main.cc:429
 msgid "failed to getch in main menu"
 msgstr "getch: huts egin du menu nagusian"
 
-#: dselect/main.cc:490
+#: dselect/main.cc:502
 #, c-format
 msgid "unknown action string `%.50s'"
 msgstr "`%.50s' ekintza-kate ezezaguna"
@@ -5397,63 +5387,44 @@ msgstr "Errorea formatuan"
 msgid "--contents takes exactly one argument"
 msgstr "--contents: argumentu bat hartzen du zehazki"
 
-#: 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 "' paketearen artxiboaren amaierako bertsioa "
 
-#: dpkg-deb/main.c:50
+#: dpkg-deb/main.c:56
+#, 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 dpkg-deb --licence for details.\n"
-msgstr ""
-"Software hau librea da; kopiatzeko baldintzen berri izateko, ikus\n"
-"GNU Lizentzia Publiko Orokorraren 2 bertsioa edo berriagoa.\n"
-"EZ dago bermerik.\n"
-"Ikus dpkg-deb --licence xehetasun gehiago izateko.\n"
-
-#: dpkg-deb/main.c:58
-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"
-"\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"
+"  -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"
-"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 ""
 "Komandoak:\n"
 "  -b|--build <directory> [<deb>]    fitxategi batetan sortu.\n"
@@ -5499,7 +5470,16 @@ msgstr ""
 "extract'\n"
 "erabiliaz irekitako paketeak oker instalatuko dira !\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."
@@ -5507,7 +5487,7 @@ msgstr ""
 "Idatzi dpkg-deb --help *.deb fitxategiak manipulatzeko laguntza lortzeko;\n"
 "Idatzi dpkg --help paketeak instalatu eta desinstalatzeko laguntza lortzeko."
 
-#: dpkg-deb/main.c:176
+#: dpkg-deb/main.c:181
 #, c-format
 msgid "unknown compression type `%s'!"
 msgstr "%s konpresio mota ezezaguna!"
@@ -5681,43 +5661,41 @@ msgstr "--join: zati-fitxategiko argumentu bat edo gehiago behar ditu"
 msgid "part %d is missing"
 msgstr "%d zatia falta da"
 
-#: 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' paketeak zatitu/batzeko tresna; bertsioa "
 
-#: 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. Software hau librea da;\n"
-"kopiatzeko baldintzen berri izateko, ikus GNU Lizentzia Publiko\n"
-"Orokorraren 2 bertsioa edo berriagoa. EZ dago bermerik. Ikus\n"
-"dpkg-split --licence xehetasun gehiago lortzeko.\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 ""
@@ -5743,30 +5721,30 @@ msgstr ""
 "\n"
 "Irteera-egoera: 0 = Ados;  1 = -a ez da zatia;  2 = arazoak!\n"
 
-#: dpkg-split/main.c:69
+#: dpkg-split/main.c:75
 msgid "Type dpkg-split --help for help."
 msgstr "Idatzi dpkg-split --help laguntza lortzeko."
 
-#: dpkg-split/main.c:79
+#: dpkg-split/main.c:85
 #, c-format
 msgid "error reading %s"
 msgstr "errorea %s irakurtzean"
 
-#: dpkg-split/main.c:83
+#: dpkg-split/main.c:89
 #, c-format
 msgid "error reading %.250s"
 msgstr "errorea %.250s irakurtzean"
 
-#: dpkg-split/main.c:84
+#: dpkg-split/main.c:90
 #, c-format
 msgid "unexpected end of file in %.250s"
 msgstr "%.250s: ustekabeko fitxategi-amaiera "
 
-#: dpkg-split/main.c:104
+#: dpkg-split/main.c:110
 msgid "part size is far too large or is not positive"
 msgstr "zatiaren tamaina handiegia da, edo ez da positiboa"
 
-#: 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 "zatiaren tamainak %dk izan behar du gutxienez (goiburua onartzeko)"
@@ -5902,3 +5880,72 @@ msgstr "helburuko `%.250s' fitxategia ez da fitxategi arrunta"
 #: dpkg-split/split.c:70
 msgid "unable to exec mksplit"
 msgstr "ezin da mksplit exekutatu"
+
+#~ 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 ""
+#~ "Software hau librea da; kopiatzeko baldintzen berri izateko, ikus\n"
+#~ "GNU Lizentzia Publiko Orokorraren 2 bertsioa edo berriagoa.\n"
+#~ "EZ dago bermerik.\n"
+#~ "Ikus "
+
+#~ msgid " --licence for copyright and license details.\n"
+#~ msgstr ""
+#~ " --licence copyright-ari eta lizentziari buruzko xehetasunetarako.\n"
+
+#~ msgid "Debian `"
+#~ msgstr "Debian `"
+
+#~ msgid "Usage: "
+#~ msgstr "Erabilera: "
+
+#~ 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 ""
+#~ "%s bertsioa.\n"
+#~ "Copyright (C) 1994-1996 Ian Jackson.\n"
+#~ "Copyright (C) 2000,2001 Wichert Akkerman.\n"
+#~ "Software hau librea da; kopiatzeko baldintzen berri izateko, ikus\n"
+#~ "GNU Lizentzia Publiko Orokorraren 2 bertsioa edo berriagoa. EZ dago\n"
+#~ "bermerik. Ikus dselect --licence xehetasun gehiago lortzeko.\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 ""
+#~ "Erabilera: \n"
+#~ "  dselect [aukerak]\n"
+#~ "  dselect [aukerak] ekintza ...\n"
+#~ "Aukerak: \n"
+#~ "  --admindir <direktorioa>  (lehenetsia: /var/lib/dpkg)\n"
+#~ "  --help  --version  --licence  --expert  --debug <fitxategia> | -"
+#~ "D<fitxategia>\n"
+#~ "  --colour pantaila-zatia:[aurreko planoa],[atzeko planoa][:atr[+atr"
+#~ "+..]]\n"
+#~ "Ekintzak:  \n"
+#~ "  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. Software hau librea da;\n"
+#~ "kopiatzeko baldintzen berri izateko, ikus GNU Lizentzia Publiko\n"
+#~ "Orokorraren 2 bertsioa edo berriagoa. EZ dago bermerik. Ikus\n"
+#~ "dpkg-split --licence xehetasun gehiago lortzeko.\n"

po/fr.po

@@ -22,7 +22,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: fr\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: 2005-11-01 18:35+0100\n"
 "Last-Translator: Christian Perrier <bubulle@debian.org>\n"
 "Language-Team: French <debian-l10n-french@lists.debian.org>\n"
@@ -2255,91 +2255,90 @@ msgid "failed to exec rm for cleanup"
 msgstr "échec de l'exécution de « rm » pour nettoyage"
 
 #: 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 " » programme de gestion de paquets 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 ""
 "Ce programme est un logiciel libre ; prière de consulter la « GNU General\n"
-"Public Licence » version 2 ou supérieure pour prendre connaissance des\n"
+"Public  License » version 2 ou supérieure pour prendre connaissance des\n"
 "conditions de reproduction. Nous n'offrons AUCUNE garantie.\n"
-"Voir "
-
-#: src/main.c:50 src/query.c:465
-msgid " --licence for copyright and license details.\n"
-msgstr " --licence pour plus de détails sur le copyright et la licence.\n"
+"Voir dpkg-deb --license pour plus de détails.\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 ""
@@ -2433,14 +2432,15 @@ msgstr ""
 "Utilisez « dselect » ou « aptitude » pour gérer les paquets de manière plus "
 "conviviale.\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 "
@@ -2461,17 +2461,17 @@ msgstr ""
 "Les options marquées d'un [*] affichent beaucoup d'informations - tubez-les "
 "à travers « less » ou « 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 "actions conflictuelles --%s et --%s"
 
-#: src/main.c:189
+#: src/main.c:191
 #, c-format
 msgid "Warning: obsolete option `--%s'\n"
 msgstr "Attention : option obsolète « --%s »\n"
 
-#: src/main.c:197
+#: src/main.c:199
 #, c-format
 msgid ""
 "%s debugging option, --debug=<octal> or -D<octal>:\n"
@@ -2513,30 +2513,30 @@ msgstr ""
 "Les options de débogage peuvent être groupées avec un « ou » logique.\n"
 "Notez que la signification et les valeurs sont sujettes à changements.\n"
 
-#: src/main.c:216
+#: src/main.c:218
 msgid "--debug requires an octal argument"
 msgstr "--debug requiert un argument octal"
 
-#: src/main.c:240
+#: src/main.c:242
 #, c-format
 msgid "null package name in --ignore-depends comma-separated list `%.250s'"
 msgstr ""
 "nom de paquet vide dans la liste « %.250s » d'éléments séparés par des "
 "virgules de --ignore-depends"
 
-#: 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 requiert un nom de paquet légal. « %.250s » ne l'est pas ; %"
 "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 "entier incorrect pour --%s « %.250s »"
 
-#: src/main.c:292
+#: src/main.c:294
 #, c-format
 msgid ""
 "%s forcing options - control behaviour when problems found:\n"
@@ -2628,48 +2628,48 @@ msgstr ""
 "           installation.\n"
 "Les options de forçage marquées [*] sont activées par défaut.\n"
 
-#: src/main.c:337
+#: src/main.c:339
 #, c-format
 msgid "unknown force/refuse option `%.*s'"
 msgstr "option de forçage/refus « %.*s » inconnue"
 
-#: src/main.c:442 src/main.c:446
+#: src/main.c:444 src/main.c:448
 msgid "couldn't malloc in execbackend"
 msgstr "Impossible de faire un « malloc » dans « execbackend »"
 
-#: src/main.c:444 src/main.c:451
+#: src/main.c:446 src/main.c:453
 msgid "couldn't strdup in execbackend"
 msgstr "Impossible de faire un « strdup » dans « execbackend »"
 
-#: src/main.c:455
+#: src/main.c:457
 #, c-format
 msgid "failed to exec %s"
 msgstr "échec de l'exécution de « %s »"
 
-#: src/main.c:467
+#: src/main.c:469
 msgid "--command-fd takes 1 argument, not 0"
 msgstr "--command-fd prend un argument et non zéro"
 
-#: src/main.c:468
+#: src/main.c:470
 msgid "--command-fd only takes 1 argument"
 msgstr "--command-fd ne prend qu'un argument"
 
-#: src/main.c:470
+#: src/main.c:472
 msgid "invalid number for --command-fd"
 msgstr "nombre invalide pour --command-fd"
 
-#: src/main.c:472
+#: src/main.c:474
 #, c-format
 msgid "couldn't open `%i' for stream"
 msgstr "impossible d'ouvrir le flux d'entrée « %i »"
 
-#: src/main.c:497
+#: src/main.c:499
 #, c-format
 msgid "unexpected eof before end of line %d"
 msgstr "EOF inattendu avant la fin de la ligne %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 "requiert une option d'action"
 
@@ -3073,46 +3073,31 @@ msgstr ""
 "archives, et dpkg --contents (= dpkg-deb --contents) pour afficher leur\n"
 "contenu.\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 " » outil d'interrogation du programme de gestion de paquets\n"
 
-#: src/query.c:473
-#, c-format
-msgid "Usage: "
-msgstr "Usage : "
-
-#: 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 ""
 " [<option>] <commande>\n"
 "Commandes :\n"
@@ -3143,10 +3128,25 @@ msgstr ""
 "  seront alignés à droite, à moins que la taille spécifiée ne soit\n"
 "  négative, auquel cas un alignement à gauche sera appliqué.\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 ""
 "Utilisez --help pour savoir comment enquêter sur les paquets ;\n"
@@ -4222,113 +4222,100 @@ 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 "interface de gestion de paquets Debian « %s »."
 
 #: 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 © 1994-1996 Ian Jackson.\n"
-"Copyright © 2000,2001 Wichert Akkerman.\n"
-"Ce programme est un logiciel libre ; prière de consulter la « GNU General\n"
-"Public License » version 2 ou supérieure pour prendre connaissance des\n"
-"conditions de reproduction. Nous n'offrons AUCUNE garantie quant à son\n"
-"utilisation.  Vous êtes invités à consulter dselect --licence pour prendre\n"
-"connaissance des détails ayant trait à la licence.\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 ""
-"Utilisation : dselect [options]\n"
-"              dselect [options] action ...\n"
-"Options :  --admindir <répertoire>  (par défaut /var/lib/dpkg)\n"
-"           --help  --version  --licence  --expert  --debug <fichier> | -"
-"D<fichier>\n"
-"           --colour partie d'écran:[arrière-plan],[avant-plan][:attr[+attr"
-"+...]]\n"
-"Actions :     access  update        select       install   config     "
-"remove    quit    menu\n"
-"(Traduction : accéder mettre à jour sélectionner installer configurer "
-"supprimer quitter menu)\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 "Parties de l'écran :\n"
 
-#: dselect/main.cc:182
+#: dselect/main.cc:192
 #, c-format
 msgid "Colours:\n"
 msgstr "Couleurs :\n"
 
-#: dselect/main.cc:187
+#: dselect/main.cc:197
 #, c-format
 msgid "Attributes:\n"
 msgstr "Attributs :\n"
 
-#: dselect/main.cc:207
+#: dselect/main.cc:217
 #, c-format
 msgid "couldn't open debug file `%.255s'\n"
 msgstr "impossible d'ouvrir le fichier de débogage « %.255s »\n"
 
-#: dselect/main.cc:222
+#: dselect/main.cc:232
 #, c-format
 msgid "Invalid %s `%s'\n"
 msgstr "Invalide %s « %s »\n"
 
-#: dselect/main.cc:239
+#: dselect/main.cc:249
 msgid "screen part"
 msgstr "Partie de l'écran"
 
-#: dselect/main.cc:245
+#: dselect/main.cc:255
 msgid "Null colour specification\n"
 msgstr "Spécification de couleur nulle\n"
 
-#: dselect/main.cc:253 dselect/main.cc:258
+#: dselect/main.cc:263 dselect/main.cc:268
 msgid "colour"
 msgstr "couleur"
 
-#: dselect/main.cc:266
+#: dselect/main.cc:276
 msgid "colour attribute"
 msgstr "attribut de couleur"
 
-#: dselect/main.cc:300
+#: dselect/main.cc:310
 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:302
+#: dselect/main.cc:312
 msgid "Terminal does not appear to support highlighting.\n"
 msgstr "Il semble que votre terminal ne supporte pas le surlignage\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 ""
 "Positionnez correctement votre variable TERM, utilisez\n"
 "un meilleur terminal ou contentez-vous d'une installation\n"
 "paquet par paquet avec l'outil de gestion de paquets "
 
-#: dselect/main.cc:306
+#: dselect/main.cc:317
 msgid "terminal lacks necessary features, giving up"
 msgstr "Il manque d'importantes fonctionnalités au terminal, abandon"
 
-#: dselect/main.cc:384
+#: dselect/main.cc:395
 msgid ""
 "\n"
 "\n"
@@ -4343,7 +4330,7 @@ msgstr ""
 "Appuyez sur <Entrée> pour confirmer la sélection. ^L pour redessiner "
 "l'écran.\n"
 
-#: dselect/main.cc:398
+#: dselect/main.cc:410
 msgid ""
 "\n"
 "\n"
@@ -4353,11 +4340,11 @@ msgstr ""
 "\n"
 "Accès en lecture seule : seul un aperçu des sélections est disponible !"
 
-#: dselect/main.cc:417
+#: dselect/main.cc:429
 msgid "failed to getch in main menu"
 msgstr "échec de « getch » dans le menu principal"
 
-#: dselect/main.cc:490
+#: dselect/main.cc:502
 #, c-format
 msgid "unknown action string `%.50s'"
 msgstr "chaîne d'action inconnue « %.50s »"
@@ -5617,63 +5604,44 @@ msgstr "Erreur dans le format"
 msgid "--contents takes exactly one argument"
 msgstr "--contents prend exactement un argument"
 
-#: 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 " » version finale de l'archive du paquet "
 
-#: dpkg-deb/main.c:50
+#: dpkg-deb/main.c:56
+#, 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 dpkg-deb --licence for details.\n"
-msgstr ""
-"Ce programme est un logiciel libre ; prière de consulter la « GNU General\n"
-"Public  License » version 2 ou supérieure pour prendre connaissance des\n"
-"conditions de reproduction. Nous n'offrons AUCUNE garantie.\n"
-"Voir dpkg-deb --license pour plus de détails.\n"
-
-#: dpkg-deb/main.c:58
-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"
-"\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"
+"  -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"
-"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 ""
 "Commande :\n"
 "  -b|--build <répertoire> [<deb>]   Construit une archive.\n"
@@ -5723,7 +5691,16 @@ msgstr ""
 "Les paquets dépaquetés en utilisant « dpkg-deb --extract » seront\n"
 "incorrectement installés.\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."
@@ -5733,7 +5710,7 @@ msgstr ""
 "Taper dpkg --help pour obtenir une aide sur l'installation et la "
 "désinstallation des paquets."
 
-#: dpkg-deb/main.c:176
+#: dpkg-deb/main.c:181
 #, c-format
 msgid "unknown compression type `%s'!"
 msgstr "type de compression %s inconnu"
@@ -5915,46 +5892,42 @@ msgstr "--join requiert un ou plusieurs fichiers comme arguments"
 msgid "part %d is missing"
 msgstr "la partie %d est manquante"
 
-#: 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 » outil de (dés)assemblage de paquets ; "
 "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 © 1994-1996 Ian Jackson. Ce programme est un logiciel\n"
-"libre ; prière de consulter la « GNU General Public License » version 2 ou\n"
-"supérieure pour prendre connaissance des conditions de reproduction.\n"
-"Nous n'offrons AUCUNE garantie quant à son utilisation. Vous êtes\n"
-"invités à consulter dpkg-deb --licence pour prendre connaissance\n"
-"des détails ayant trait à la licence.\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 ""
@@ -5985,30 +5958,30 @@ msgstr ""
 "\n"
 "Code de sortie : 0 = OK ;  1 = -a n'est pas une partie ;  2 = problème !\n"
 
-#: dpkg-split/main.c:69
+#: dpkg-split/main.c:75
 msgid "Type dpkg-split --help for help."
 msgstr "Taper dpkg-split --help pour obtenir de l'aide."
 
-#: dpkg-split/main.c:79
+#: dpkg-split/main.c:85
 #, c-format
 msgid "error reading %s"
 msgstr "erreur de lecture sur %s"
 
-#: dpkg-split/main.c:83
+#: dpkg-split/main.c:89
 #, c-format
 msgid "error reading %.250s"
 msgstr "erreur de lecture sur %.250s"
 
-#: dpkg-split/main.c:84
+#: dpkg-split/main.c:90
 #, c-format
 msgid "unexpected end of file in %.250s"
 msgstr "fin de fichier inattendue dans %.250s"
 
-#: dpkg-split/main.c:104
+#: dpkg-split/main.c:110
 msgid "part size is far too large or is not positive"
 msgstr "taille de partie beaucoup trop grande ou négative"
 
-#: 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 ""
@@ -6145,3 +6118,79 @@ msgstr "le fichier source
 #: dpkg-split/split.c:70
 msgid "unable to exec mksplit"
 msgstr "impossible d'exécuter 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 ""
+#~ "Ce programme est un logiciel libre ; prière de consulter la « GNU "
+#~ "General\n"
+#~ "Public Licence » version 2 ou supérieure pour prendre connaissance des\n"
+#~ "conditions de reproduction. Nous n'offrons AUCUNE garantie.\n"
+#~ "Voir "
+
+#~ msgid " --licence for copyright and license details.\n"
+#~ msgstr " --licence pour plus de détails sur le copyright et la licence.\n"
+
+#~ msgid "Debian `"
+#~ msgstr "Debian « "
+
+#~ msgid "Usage: "
+#~ msgstr "Usage : "
+
+#~ 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 © 1994-1996 Ian Jackson.\n"
+#~ "Copyright © 2000,2001 Wichert Akkerman.\n"
+#~ "Ce programme est un logiciel libre ; prière de consulter la « GNU "
+#~ "General\n"
+#~ "Public License » version 2 ou supérieure pour prendre connaissance des\n"
+#~ "conditions de reproduction. Nous n'offrons AUCUNE garantie quant à son\n"
+#~ "utilisation.  Vous êtes invités à consulter dselect --licence pour "
+#~ "prendre\n"
+#~ "connaissance des détails ayant trait à la licence.\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 ""
+#~ "Utilisation : dselect [options]\n"
+#~ "              dselect [options] action ...\n"
+#~ "Options :  --admindir <répertoire>  (par défaut /var/lib/dpkg)\n"
+#~ "           --help  --version  --licence  --expert  --debug <fichier> | -"
+#~ "D<fichier>\n"
+#~ "           --colour partie d'écran:[arrière-plan],[avant-plan][:attr[+attr"
+#~ "+...]]\n"
+#~ "Actions :     access  update        select       install   config     "
+#~ "remove    quit    menu\n"
+#~ "(Traduction : accéder mettre à jour sélectionner installer configurer "
+#~ "supprimer quitter menu)\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 © 1994-1996 Ian Jackson. Ce programme est un logiciel\n"
+#~ "libre ; prière de consulter la « GNU General Public License » version 2 "
+#~ "ou\n"
+#~ "supérieure pour prendre connaissance des conditions de reproduction.\n"
+#~ "Nous n'offrons AUCUNE garantie quant à son utilisation. Vous êtes\n"
+#~ "invités à consulter dpkg-deb --licence pour prendre connaissance\n"
+#~ "des détails ayant trait à la licence.\n"

po/gl.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dpkg\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: 2005-11-30 15:41+0100\n"
 "Last-Translator: Jacobo Tarrío <jtarrio@debian.org>\n"
 "Language-Team: Galician <trasno@ceu.fi.udc.es>\n"
@@ -2155,90 +2155,90 @@ msgid "failed to exec rm for cleanup"
 msgstr "non se puido executar rm para a limpeza"
 
 #: src/main.c:44
-msgid "Debian GNU/Linux `"
-msgstr "Programa de xestión de paquetes \""
-
-#: src/main.c:46
-msgid "' package management program version "
+#, fuzzy, c-format
+msgid "Debian `%s' package management program version %s.\n"
 msgstr "\" de Debian GNU/Linux versión "
 
-#: 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 ""
-"Este é software libre; vexa a Licencia Pública Xeral de GNU versión 2 ou\n"
-"unha posterior para as condicións de copia. NON hai garantía.\n"
-"Vexa "
-
-#: src/main.c:50 src/query.c:465
-msgid " --licence for copyright and license details.\n"
-msgstr " --licence para detalles do copyright e a licencia.\n"
+"Este é software libre; vexa a Licencia Pública Xeral de GNU (GNU GPL) "
+"versión\n"
+"2 ou unha posterior para as condicións de copia. NON hai garantía.\n"
+"Vexa dpkg-deb --licence para detalles.\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 ""
@@ -2321,14 +2321,15 @@ msgstr ""
 "Empregue \"dselect\" ou \"aptitude\" para xestión de paquetes amigable co "
 "usuario.\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 "
@@ -2346,17 +2347,17 @@ msgstr ""
 "As opcións marcadas [*] producen moita saída - pásea por \"less\" ou \"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 "as accións --%s e --%s teñen un conflicto"
 
-#: src/main.c:189
+#: src/main.c:191
 #, c-format
 msgid "Warning: obsolete option `--%s'\n"
 msgstr "Aviso: opción \"--%s\" obsoleta\n"
 
-#: src/main.c:197
+#: src/main.c:199
 #, c-format
 msgid ""
 "%s debugging option, --debug=<octal> or -D<octal>:\n"
@@ -2394,29 +2395,29 @@ msgstr ""
 "As opcións de depuración mestúranse empregando a operación \"OR\" binaria.\n"
 "Teña en conta que os significados e valores poden cambiar.\n"
 
-#: src/main.c:216
+#: src/main.c:218
 msgid "--debug requires an octal argument"
 msgstr "--debug precisa dun argumento octal"
 
-#: src/main.c:240
+#: src/main.c:242
 #, c-format
 msgid "null package name in --ignore-depends comma-separated list `%.250s'"
 msgstr ""
 "nome de paquete nulo na lista separada por comas de --ignore-depends \"%.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 precisa dun nome válido de paquete. \"%.250s\" non o é; %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 "número enteiro non válido para --%s: \"%.250s\""
 
-#: src/main.c:292
+#: src/main.c:294
 #, c-format
 msgid ""
 "%s forcing options - control behaviour when problems found:\n"
@@ -2494,48 +2495,48 @@ msgstr ""
 "AVISO - o emprego das opcións marcadas [!] pode danar gravemente a súa\n"
 "instalación. O forzado das opcións marcadas [*] está activado por defecto.\n"
 
-#: src/main.c:337
+#: src/main.c:339
 #, c-format
 msgid "unknown force/refuse option `%.*s'"
 msgstr "opción de forzar/rexeitar \"%.*s\" descoñecida"
 
-#: src/main.c:442 src/main.c:446
+#: src/main.c:444 src/main.c:448
 msgid "couldn't malloc in execbackend"
 msgstr "non se puido facer malloc en execbackend"
 
-#: src/main.c:444 src/main.c:451
+#: src/main.c:446 src/main.c:453
 msgid "couldn't strdup in execbackend"
 msgstr "non se puido facer strdup en execbackend"
 
-#: src/main.c:455
+#: src/main.c:457
 #, c-format
 msgid "failed to exec %s"
 msgstr "non se puido executar %s"
 
-#: src/main.c:467
+#: src/main.c:469
 msgid "--command-fd takes 1 argument, not 0"
 msgstr "--command-fd toma 1 argumento, non 0"
 
-#: src/main.c:468
+#: src/main.c:470
 msgid "--command-fd only takes 1 argument"
 msgstr "--command-fd só toma 1 argumento"
 
-#: src/main.c:470
+#: src/main.c:472
 msgid "invalid number for --command-fd"
 msgstr "número non válido para --command-fd"
 
-#: src/main.c:472
+#: src/main.c:474
 #, c-format
 msgid "couldn't open `%i' for stream"
 msgstr "non se puido abrir \"%i\" para fluxo"
 
-#: src/main.c:497
+#: src/main.c:499
 #, c-format
 msgid "unexpected eof before end of line %d"
 msgstr "fin de ficheiro inesperada antes da fin da liña %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 "precísase dunha opción de acción"
 
@@ -2941,46 +2942,31 @@ msgstr ""
 "e dpkg --contents (= dpkg-deb --contents) para ver unha lista do seu "
 "contido.\n"
 
-#: src/query.c:459 dpkg-deb/main.c:46
-msgid "Debian `"
-msgstr "\""
-
-#: 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 "\", ferramenta de consulta de xestión de paquetes\n"
 
-#: src/query.c:473
-#, c-format
-msgid "Usage: "
-msgstr "Emprego: "
-
-#: 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 ""
 " [<opción>] <orde>\n"
 "Ordes:\n"
@@ -3007,10 +2993,25 @@ msgstr ""
 "  ${var[;anchura]}. Os campos van aliñados á dereita a menos que a anchura\n"
 "  sexa negativa, e daquela emprégase aliñamento á esquerda. \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 ""
 "Empregue --help para obter axuda sobre consultas sobre paquetes;\n"
@@ -4067,105 +4068,99 @@ msgid "menu"
 msgstr "menú"
 
 #: 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 "Interface de xestión de paquetes \"%s\" de Debian."
 
 #: 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 ""
-"Versión %s.\n"
-"Copyright (C) 1994-1996 Ian Jackson.\n"
-"Copyright (C) 2000,2001 Wichert Akkerman.\n"
-"Este é software libre; vexa a Licencia Pública Xeral de GNU (GNU GPL)\n"
-"versión 2 ou posterior para as condicións de copia. NON hai garantía. Vexa\n"
-"dselect --licence para detalles.\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 ""
-"Emprego: dselect [opcións]\n"
-"         dselect [opcións] acción ...\n"
-"Opcións:  --admindir <directorio>  (por defecto é /var/lib/dpkg)\n"
-"          --help  --version  --licence  --expert  --debug <fich> | -D<fich>\n"
-"          --colour parte_pantalla:[primeiro_plano],[fondo][:atr[+atr+...]]\n"
-"Accións:  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 "Partes da pantalla:\n"
 
-#: dselect/main.cc:182
+#: dselect/main.cc:192
 #, c-format
 msgid "Colours:\n"
 msgstr "Cores:\n"
 
-#: dselect/main.cc:187
+#: dselect/main.cc:197
 #, c-format
 msgid "Attributes:\n"
 msgstr "Atributos:\n"
 
-#: dselect/main.cc:207
+#: dselect/main.cc:217
 #, c-format
 msgid "couldn't open debug file `%.255s'\n"
 msgstr "non se puido abrir o ficheiro de depuración \"%.255s\"\n"
 
-#: dselect/main.cc:222
+#: dselect/main.cc:232
 #, c-format
 msgid "Invalid %s `%s'\n"
 msgstr "%s \"%s\" non válido\n"
 
-#: dselect/main.cc:239
+#: dselect/main.cc:249
 msgid "screen part"
 msgstr "parte da pantalla"
 
-#: dselect/main.cc:245
+#: dselect/main.cc:255
 msgid "Null colour specification\n"
 msgstr "Especificación de cores nula\n"
 
-#: dselect/main.cc:253 dselect/main.cc:258
+#: dselect/main.cc:263 dselect/main.cc:268
 msgid "colour"
 msgstr "cor"
 
-#: dselect/main.cc:266
+#: dselect/main.cc:276
 msgid "colour attribute"
 msgstr "atributo de cores"
 
-#: dselect/main.cc:300
+#: dselect/main.cc:310
 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:302
+#: dselect/main.cc:312
 msgid "Terminal does not appear to support highlighting.\n"
 msgstr "Semella que o terminal non soporta resaltado.\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 ""
 "Estabreza correctamente a súa variable TERM, empregue un terminal mellor\n"
 "ou empregue a ferramenta de xestión paquete a paquete "
 
-#: dselect/main.cc:306
+#: dselect/main.cc:317
 msgid "terminal lacks necessary features, giving up"
 msgstr "o terminal non ten características necesarias; sáese"
 
-#: dselect/main.cc:384
+#: dselect/main.cc:395
 msgid ""
 "\n"
 "\n"
@@ -4178,7 +4173,7 @@ msgstr ""
 "Móvase con ^P e ^N, as frechas do cursor, letras iniciais ou números;\n"
 "Prema <intro> para confirmar a selección. ^L volve debuxar a pantalla.\n"
 
-#: dselect/main.cc:398
+#: dselect/main.cc:410
 msgid ""
 "\n"
 "\n"
@@ -4188,11 +4183,11 @@ msgstr ""
 "\n"
 "Acceso de só lectura: só está dispoñible a previsualización das seleccións."
 
-#: dselect/main.cc:417
+#: dselect/main.cc:429
 msgid "failed to getch in main menu"
 msgstr "non se puido chamar a getch no menú principal"
 
-#: dselect/main.cc:490
+#: dselect/main.cc:502
 #, c-format
 msgid "unknown action string `%.50s'"
 msgstr "cadea de acción \"%.50s\" descoñecida"
@@ -5433,63 +5428,44 @@ msgstr "Erro no formato"
 msgid "--contents takes exactly one argument"
 msgstr "--contents toma exactamente un argumento"
 
-#: 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 "\", backend de arquivos de paquetes, versión "
 
-#: dpkg-deb/main.c:50
+#: dpkg-deb/main.c:56
+#, 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 dpkg-deb --licence for details.\n"
-msgstr ""
-"Este é software libre; vexa a Licencia Pública Xeral de GNU (GNU GPL) "
-"versión\n"
-"2 ou unha posterior para as condicións de copia. NON hai garantía.\n"
-"Vexa dpkg-deb --licence para detalles.\n"
-
-#: dpkg-deb/main.c:58
-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"
-"\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"
+"  -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"
-"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 ""
 "Orde:\n"
 "  -b|--build <directorio> [<deb>]   constrúe un arquivo.\n"
@@ -5535,7 +5511,16 @@ msgstr ""
 "se extraian empregando \"dpkg-deb --extract\" hanse instalar "
 "incorrectamente.\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."
@@ -5544,7 +5529,7 @@ msgstr ""
 "Escriba dpkg --help para axuda sobre instalación e desinstalación de "
 "paquetes."
 
-#: dpkg-deb/main.c:176
+#: dpkg-deb/main.c:181
 #, c-format
 msgid "unknown compression type `%s'!"
 msgstr "tipo de compresión \"%s\" descoñecido"
@@ -5723,42 +5708,41 @@ msgstr "--join precisa de un ou máis argumentos de ficheiro de partes"
 msgid "part %d is missing"
 msgstr "falla a parte %d"
 
-#: 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 ""
 "Ferramenta para partir/unir paquetes de Debian \"dpkg-split\", versión "
 
-#: 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. Este é software libre; vexa a Licencia\n"
-"Pública Xeral de GNU (GNU GPL) versión 2 ou posterior para as condicións de\n"
-"copia. NON hai garantía. Vexa dpkg-split --licence para detalles.\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 ""
@@ -5782,30 +5766,30 @@ msgstr ""
 "\n"
 "Estado de saída: 0 = Ok;  1 = -a non é unha parte;  2 = ¡problemas!\n"
 
-#: dpkg-split/main.c:69
+#: dpkg-split/main.c:75
 msgid "Type dpkg-split --help for help."
 msgstr "Escriba dpkg-split --help para obter axuda."
 
-#: dpkg-split/main.c:79
+#: dpkg-split/main.c:85
 #, c-format
 msgid "error reading %s"
 msgstr "erro ao ler %s"
 
-#: dpkg-split/main.c:83
+#: dpkg-split/main.c:89
 #, c-format
 msgid "error reading %.250s"
 msgstr "erro ao ler %.250s"
 
-#: dpkg-split/main.c:84
+#: dpkg-split/main.c:90
 #, c-format
 msgid "unexpected end of file in %.250s"
 msgstr "fin de ficheiro inesperada en %.250s"
 
-#: dpkg-split/main.c:104
+#: dpkg-split/main.c:110
 msgid "part size is far too large or is not positive"
 msgstr "o tamaño da parte é grande de máis ou non é positivo"
 
-#: 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 "o tamaño da parte debe ser alomenos %dk (para que caiba a cabeceira)"
@@ -5940,3 +5924,69 @@ msgstr "o ficheiro de orixe \"%.250s\" non é un ficheiro normal"
 #: dpkg-split/split.c:70
 msgid "unable to exec mksplit"
 msgstr "non se pode executar mksplit"
+
+#~ msgid "Debian GNU/Linux `"
+#~ msgstr "Programa de xestión de paquetes \""
+
+#~ 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 ""
+#~ "Este é software libre; vexa a Licencia Pública Xeral de GNU versión 2 ou\n"
+#~ "unha posterior para as condicións de copia. NON hai garantía.\n"
+#~ "Vexa "
+
+#~ msgid " --licence for copyright and license details.\n"
+#~ msgstr " --licence para detalles do copyright e a licencia.\n"
+
+#~ msgid "Debian `"
+#~ msgstr "\""
+
+#~ msgid "Usage: "
+#~ msgstr "Emprego: "
+
+#~ 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 ""
+#~ "Versión %s.\n"
+#~ "Copyright (C) 1994-1996 Ian Jackson.\n"
+#~ "Copyright (C) 2000,2001 Wichert Akkerman.\n"
+#~ "Este é software libre; vexa a Licencia Pública Xeral de GNU (GNU GPL)\n"
+#~ "versión 2 ou posterior para as condicións de copia. NON hai garantía. "
+#~ "Vexa\n"
+#~ "dselect --licence para detalles.\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 ""
+#~ "Emprego: dselect [opcións]\n"
+#~ "         dselect [opcións] acción ...\n"
+#~ "Opcións:  --admindir <directorio>  (por defecto é /var/lib/dpkg)\n"
+#~ "          --help  --version  --licence  --expert  --debug <fich> | -"
+#~ "D<fich>\n"
+#~ "          --colour parte_pantalla:[primeiro_plano],[fondo][:atr[+atr"
+#~ "+...]]\n"
+#~ "Accións:  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. Este é software libre; vexa a "
+#~ "Licencia\n"
+#~ "Pública Xeral de GNU (GNU GPL) versión 2 ou posterior para as condicións "
+#~ "de\n"
+#~ "copia. NON hai garantía. Vexa dpkg-split --licence para detalles.\n"

po/id.po

@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dpkg 1.13\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: 2005-12-23 18:05+0700\n"
 "Last-Translator: Parlin Imanuel <parlin_i@yahoo.com>\n"
 "Language-Team: Debian Indonesia L10N Team <debian-l10n-id@gurame.fisika.ui."
@@ -2128,91 +2128,90 @@ msgid "failed to exec rm for cleanup"
 msgstr "gagal menjalankan perintah 'rm' untuk membersihkan"
 
 #: 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 "`versi program pengelola paket"
 
-#: 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 ""
-"Ini adalah perangkat lunak bebas; lihat GNU General Public Licensi versi 2 "
+"Ini adalah perangkat lunak bebas; lihat GNU General Public Licence versi 2 "
 "atau \n"
-"yang terbaru untuk melihat persyaratannya. TIDAK ADA JAMINAN.\n"
-"Lihat "
-
-#: src/main.c:50 src/query.c:465
-msgid " --licence for copyright and license details.\n"
-msgstr " --licence untuk rincian persyaratan dan perizinan.\n"
+"selanjutnya untuk persyaratan penggandaan. TIDAK ADA jaminan. \n"
+"Lihat dpkg-deb --license untuk rinciannya.\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 ""
@@ -2286,14 +2285,15 @@ msgstr ""
 "Gunakan `dselect' atau `aptitude' untuk pengelolaan paket dengan lebih "
 "mudah.\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 "
@@ -2311,17 +2311,17 @@ msgstr ""
 "Pilihan bertanda [*] menghasilkan banyak output - gunakan pipe ke `less' "
 "atau `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 "aksi --%s dan --%s berbenturan"
 
-#: src/main.c:189
+#: src/main.c:191
 #, c-format
 msgid "Warning: obsolete option `--%s'\n"
 msgstr "PERINGATAN: pilihan '--%s' sudah usang \n"
 
-#: src/main.c:197
+#: src/main.c:199
 #, c-format
 msgid ""
 "%s debugging option, --debug=<octal> or -D<octal>:\n"
@@ -2359,27 +2359,27 @@ msgstr ""
 "Pilihan-pilihan debug akan saling dipadukan dengan operasi 'bit or'.\n"
 "Ingat bahwa arti dan nilai di atas bisa saja berubah.\n"
 
-#: src/main.c:216
+#: src/main.c:218
 msgid "--debug requires an octal argument"
 msgstr "--debug membutuhkan sebuah argumen oktal"
 
-#: src/main.c:240
+#: src/main.c:242
 #, c-format
 msgid "null package name in --ignore-depends comma-separated list `%.250s'"
 msgstr "nama paket nihil dalam daftar terpisah-koma --ignore-depends `%.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 memerlukan sebuah nama paket yang sah. `%.250s' tidak; %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 "integer untuk --%s tidak sah: `%.250s'"
 
-#: src/main.c:292
+#: src/main.c:294
 #, c-format
 msgid ""
 "%s forcing options - control behaviour when problems found:\n"
@@ -2458,48 +2458,48 @@ msgstr ""
 "parah.\n"
 "Pilihan paksaan bertanda [*] akan langsung diaktifkan.\n"
 
-#: src/main.c:337
+#: src/main.c:339
 #, c-format
 msgid "unknown force/refuse option `%.*s'"
 msgstr "Pilihan force/refuse `%.*s' tak dikenal"
 
-#: src/main.c:442 src/main.c:446
+#: src/main.c:444 src/main.c:448
 msgid "couldn't malloc in execbackend"
 msgstr "tidak dapat melakukan 'malloc' pada 'execbackend'"
 
-#: src/main.c:444 src/main.c:451
+#: src/main.c:446 src/main.c:453
 msgid "couldn't strdup in execbackend"
 msgstr "tidak dapat melakukan 'strdup' pada 'execbackend'"
 
-#: src/main.c:455
+#: src/main.c:457
 #, c-format
 msgid "failed to exec %s"
 msgstr "Gagal menjalankan perintah %s"
 
-#: src/main.c:467
+#: src/main.c:469
 msgid "--command-fd takes 1 argument, not 0"
 msgstr "--command-fd butuh 1 argumen, bukan 0"
 
-#: src/main.c:468
+#: src/main.c:470
 msgid "--command-fd only takes 1 argument"
 msgstr "--command-fd hanya butuh 1 argumen"
 
-#: src/main.c:470
+#: src/main.c:472
 msgid "invalid number for --command-fd"
 msgstr "angka tidak sah untuk --command-fd"
 
-#: src/main.c:472
+#: src/main.c:474
 #, c-format
 msgid "couldn't open `%i' for stream"
 msgstr "tidak dapat membuka `%i' untuk stream"
 
-#: src/main.c:497
+#: src/main.c:499
 #, c-format
 msgid "unexpected eof before end of line %d"
 msgstr "eof tidak diharapkan sebelum akhir baris %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 "butuh suatu pilihan aksi"
 
@@ -2890,46 +2890,31 @@ msgstr ""
 "Gunakan dpkg --info (= dpkg-deb --info) untuk meneliti berkas arsip,\n"
 "dan dpkg --contents (=dpkg-deb --contents) untuk melihat isinya.\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 "' sarana penelusur progam pengelola paket\n"
 
-#: src/query.c:473
-#, c-format
-msgid "Usage: "
-msgstr "Cara Pakai: "
-
-#: 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 ""
 " [<pilihan>]<perintah>\n"
 "Perintah:\n"
@@ -2957,10 +2942,25 @@ msgstr ""
 "negatif \n"
 "  yang berarti rata-kiri akan digunakan. \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 ""
 "Gunakan --help untuk panduan tentang penelusuran paket;\n"
@@ -4041,106 +4041,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 "Antarmuka penanganan paket Debian `%s'"
 
 #: 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 ""
-"Versi %s.\n"
-"Hak Cipta (C) 1994-1996 Ian Jackson.\n"
-"Hak Cipta (C) 2000,2001 Wichert Akkerman.\n"
-"Ini adalah perangkat lunak bebas; lihat GNU General Public Licence versi 2\n"
-"atau selanjutnya untuk persyaratan penggandaan. TIDAK ADA JAMINAN.\n"
-"Gunakan `dselect --licence' untuk keterangan rinci.\n"
-
-#: dselect/main.cc:169
+msgstr ""
+
+#: 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 ""
-"Penggunaan: dselect [pilihan]\n"
-"            dselect [pilihan] aksi ...\n"
-"Pilihan: --admindir <direktori>       (nilai bawaan adalah /var/lib/dpkg)\n"
-"         --help --version --licence --expert --debug <berkas> | -D<berkas> \n"
-"         --colour bagian layar: [latar depan],[latar belakang][:attr[+attr"
-"+...]\n"
-"Aksi: 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 "Bagian Layar: \n"
 
-#: dselect/main.cc:182
+#: dselect/main.cc:192
 #, c-format
 msgid "Colours:\n"
 msgstr "Warna: \n"
 
-#: dselect/main.cc:187
+#: dselect/main.cc:197
 #, c-format
 msgid "Attributes:\n"
 msgstr "Atribut: \n"
 
-#: dselect/main.cc:207
+#: dselect/main.cc:217
 #, c-format
 msgid "couldn't open debug file `%.255s'\n"
 msgstr "tidak dapat membuka berkas debug `%.250s'\n"
 
-#: dselect/main.cc:222
+#: dselect/main.cc:232
 #, c-format
 msgid "Invalid %s `%s'\n"
 msgstr "%s `%s' tidak sah\n"
 
-#: dselect/main.cc:239
+#: dselect/main.cc:249
 msgid "screen part"
 msgstr "bagian layar"
 
-#: dselect/main.cc:245
+#: dselect/main.cc:255
 msgid "Null colour specification\n"
 msgstr "tidak ada spesifikasi warna\n"
 
-#: dselect/main.cc:253 dselect/main.cc:258
+#: dselect/main.cc:263 dselect/main.cc:268
 msgid "colour"
 msgstr "warna"
 
-#: dselect/main.cc:266
+#: dselect/main.cc:276
 msgid "colour attribute"
 msgstr "atribut warna"
 
-#: dselect/main.cc:300
+#: dselect/main.cc:310
 msgid "Terminal does not appear to support cursor addressing.\n"
 msgstr "Terminal tampaknya tidak mendukung pengalamatan cursor.\n"
 
-#: dselect/main.cc:302
+#: dselect/main.cc:312
 msgid "Terminal does not appear to support highlighting.\n"
 msgstr "Terminal tampaknya tidak mendukung penyorotan.\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 ""
 "Setel variabel TERM Anda dengan benar, gunakan terminal yang lebih baik,\n"
 "atau lakukanlah dengan sarana pengelolaan per-paket"
 
-#: dselect/main.cc:306
+#: dselect/main.cc:317
 msgid "terminal lacks necessary features, giving up"
 msgstr "terminal tak memiliki fitur yang diperlukan, menyerah"
 
-#: dselect/main.cc:384
+#: dselect/main.cc:395
 msgid ""
 "\n"
 "\n"
@@ -4154,7 +4147,7 @@ msgstr ""
 "Tekan <enter> untuk konfirmasi pilihan. ^L untuk menampil ulang layar.\n"
 "\n"
 
-#: dselect/main.cc:398
+#: dselect/main.cc:410
 msgid ""
 "\n"
 "\n"
@@ -4164,11 +4157,11 @@ msgstr ""
 "\n"
 "Akses hanya-baca: hanya pratilik pilihan yang tersedia!"
 
-#: dselect/main.cc:417
+#: dselect/main.cc:429
 msgid "failed to getch in main menu"
 msgstr "gagal melakukan 'getch' dalam menu utama"
 
-#: dselect/main.cc:490
+#: dselect/main.cc:502
 #, c-format
 msgid "unknown action string `%.50s'"
 msgstr "string aksi `%.50s' tidak dikenal"
@@ -5392,63 +5385,44 @@ msgstr "salah format"
 msgid "--contents takes exactly one argument"
 msgstr "--contents butuh tepat satu argumen"
 
-#: 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 "'versi 'backend' arsip paket"
 
-#: dpkg-deb/main.c:50
+#: dpkg-deb/main.c:56
+#, 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 dpkg-deb --licence for details.\n"
-msgstr ""
-"Ini adalah perangkat lunak bebas; lihat GNU General Public Licence versi 2 "
-"atau \n"
-"selanjutnya untuk persyaratan penggandaan. TIDAK ADA jaminan. \n"
-"Lihat dpkg-deb --license untuk rinciannya.\n"
-
-#: dpkg-deb/main.c:58
-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 ""
 "Perintah:\n"
 "  -b|--build <direktori> [<deb>]    buat suatu arsip.\n"
@@ -5493,7 +5467,16 @@ msgstr ""
 "`dselect' untuk pengelolaan paket yang akrab-pengguna. Paket yang dibuka\n"
 "dengan `dpkg-deb --extract' akan terpasang secara tidak benar!\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."
@@ -5501,7 +5484,7 @@ msgstr ""
 "Ketik dpkg-deb --help untuk panduan dalam manipulasi berkas *.deb;\n"
 "Ketik dpkg --help untuk panduan dalam pemasangan dan pembuangan paket."
 
-#: dpkg-deb/main.c:176
+#: dpkg-deb/main.c:181
 #, c-format
 msgid "unknown compression type `%s'!"
 msgstr "jenis kompresi `%s' tidak dikenal!"
@@ -5664,43 +5647,40 @@ msgstr "--join butuh satu atau lebih argumen berkas bagian"
 msgid "part %d is missing"
 msgstr "bagian %d hilang"
 
-#: 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 "Sarana pemisah/pemadu paket Debian GNU/Linux `dpkg-split'; versi "
 
-#: 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 ""
-"Hak Cipta (C) 1994-1996 Ian Jackson. Ini adalah perangkat lunak bebas; "
-"lihat \n"
-"GNU General Public Licence versi 2 atau selanjutnya untuk persyaratan \n"
-" penggandaan. TIDAK ADA jaminan. Lihat 'dpkg-split --licence' untuk "
-"rinciannya.\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 ""
@@ -5727,30 +5707,30 @@ msgstr ""
 "\n"
 "Status keluaran: 0 = Sip!; 1 = -a bukan suatu bagian; 2 = ada masalah!\n"
 
-#: dpkg-split/main.c:69
+#: dpkg-split/main.c:75
 msgid "Type dpkg-split --help for help."
 msgstr "Ketik 'dpkg-split --help' untuk bantuan"
 
-#: dpkg-split/main.c:79
+#: dpkg-split/main.c:85
 #, c-format
 msgid "error reading %s"
 msgstr "ada kesalahan saat membaca %s"
 
-#: dpkg-split/main.c:83
+#: dpkg-split/main.c:89
 #, c-format
 msgid "error reading %.250s"
 msgstr "ada kesalahan saat membaca %.250s"
 
-#: dpkg-split/main.c:84
+#: dpkg-split/main.c:90
 #, c-format
 msgid "unexpected end of file in %.250s"
 msgstr "akhiran berkas dalam %.250s tidak diharapkan"
 
-#: dpkg-split/main.c:104
+#: dpkg-split/main.c:110
 msgid "part size is far too large or is not positive"
 msgstr "ukuran bagian terlampau besar atau tidak positif"
 
-#: 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 "ukuran bagian harus sekurangnya %dk (teruntuk header)"
@@ -5886,6 +5866,74 @@ msgstr "berkas sumber `%.250s' bukan suatu berkas biasa"
 msgid "unable to exec mksplit"
 msgstr "gagal menjalankan perintah 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 ""
+#~ "Ini adalah perangkat lunak bebas; lihat GNU General Public Licensi versi "
+#~ "2 atau \n"
+#~ "yang terbaru untuk melihat persyaratannya. TIDAK ADA JAMINAN.\n"
+#~ "Lihat "
+
+#~ msgid " --licence for copyright and license details.\n"
+#~ msgstr " --licence untuk rincian persyaratan dan perizinan.\n"
+
+#~ msgid "Debian `"
+#~ msgstr "Debian `"
+
+#~ msgid "Usage: "
+#~ msgstr "Cara Pakai: "
+
+#~ 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 ""
+#~ "Versi %s.\n"
+#~ "Hak Cipta (C) 1994-1996 Ian Jackson.\n"
+#~ "Hak Cipta (C) 2000,2001 Wichert Akkerman.\n"
+#~ "Ini adalah perangkat lunak bebas; lihat GNU General Public Licence versi "
+#~ "2\n"
+#~ "atau selanjutnya untuk persyaratan penggandaan. TIDAK ADA JAMINAN.\n"
+#~ "Gunakan `dselect --licence' untuk keterangan rinci.\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 ""
+#~ "Penggunaan: dselect [pilihan]\n"
+#~ "            dselect [pilihan] aksi ...\n"
+#~ "Pilihan: --admindir <direktori>       (nilai bawaan adalah /var/lib/"
+#~ "dpkg)\n"
+#~ "         --help --version --licence --expert --debug <berkas> | -"
+#~ "D<berkas> \n"
+#~ "         --colour bagian layar: [latar depan],[latar belakang][:attr[+attr"
+#~ "+...]\n"
+#~ "Aksi: 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 ""
+#~ "Hak Cipta (C) 1994-1996 Ian Jackson. Ini adalah perangkat lunak bebas; "
+#~ "lihat \n"
+#~ "GNU General Public Licence versi 2 atau selanjutnya untuk persyaratan \n"
+#~ " penggandaan. TIDAK ADA jaminan. Lihat 'dpkg-split --licence' untuk "
+#~ "rinciannya.\n"
+
 #~ msgid "Type md5sum --help for help."
 #~ msgstr "Ketik md5sum --help untuk bantuan."
 

po/it.po

@@ -43,7 +43,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dpkg 1.10.22\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: 2005-12-24 15:38+0100\n"
 "Last-Translator: Stefano Canepa <sc@linux.it>\n"
 "Language-Team: italian <debian-l10n-italian@debian.org>\n"
@@ -2207,90 +2207,89 @@ msgid "failed to exec rm for cleanup"
 msgstr "impossibile eseguire rm per fare pulizia"
 
 #: 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 "' programma di gestione dei pacchetti versione "
 
-#: 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 ""
 "Questo è software libero; vedi la GNU General Public Licence versione 2\n"
 "o successiva per le condizioni di copia. NON c'è alcuna garanzia.\n"
-"Vedi "
-
-#: src/main.c:50 src/query.c:465
-msgid " --licence for copyright and license details.\n"
-msgstr " --licence per il copyright ed i dettagli sulla licenza.\n"
+"Vedi dpkg-deb --licence per i dettagli.\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 ""
@@ -2371,14 +2370,15 @@ msgstr ""
 "Usa 'dselect' o 'aptitude' se vuoi un'interfaccia semplice per la gestione\n"
 "dei pacchetti.\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 "
@@ -2396,17 +2396,17 @@ msgstr ""
 "Le opzioni marcate con [*] producono molto output - utilizza una pipe con\n"
 "`less' o `more' per leggerlo!"
 
-#: 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 "le azioni --%s e --%s sono in conflitto"
 
-#: src/main.c:189
+#: src/main.c:191
 #, c-format
 msgid "Warning: obsolete option `--%s'\n"
 msgstr "Attenzione: opzione obsoleta `--%s'\n"
 
-#: src/main.c:197
+#: src/main.c:199
 #, c-format
 msgid ""
 "%s debugging option, --debug=<octal> or -D<octal>:\n"
@@ -2443,29 +2443,29 @@ msgstr ""
 "Debugging options are be mixed using bitwise-or.\n"
 "Note that the meanings and values are subject to change.\n"
 
-#: src/main.c:216
+#: src/main.c:218
 msgid "--debug requires an octal argument"
 msgstr "--debug richiede un numero in base otto come parametro"
 
-#: src/main.c:240
+#: src/main.c:242
 #, c-format
 msgid "null package name in --ignore-depends comma-separated list `%.250s'"
 msgstr ""
 "uno dei nomi di pacchetto separati da virgole nella lista data a --ignore-"
 "depends `%.250s' è nullo"
 
-#: 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 richiede un nome di pacchetto legale. `%.250s' non lo è; %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 "numero intero non valido per l'opzione --%s: `%.250s'"
 
-#: src/main.c:292
+#: src/main.c:294
 #, c-format
 msgid ""
 "%s forcing options - control behaviour when problems found:\n"
@@ -2554,48 +2554,48 @@ msgstr ""
 "seriamente la vostra installazione.\n"
 "Le opzioni contrassegnate da [*] sono abilitate di default.\n"
 
-#: src/main.c:337
+#: src/main.c:339
 #, c-format
 msgid "unknown force/refuse option `%.*s'"
 msgstr "opzione force/refuse sconosciuta: `%.*s'"
 
-#: src/main.c:442 src/main.c:446
+#: src/main.c:444 src/main.c:448
 msgid "couldn't malloc in execbackend"
 msgstr "impossibile fare malloc in execbackend"
 
-#: src/main.c:444 src/main.c:451
+#: src/main.c:446 src/main.c:453
 msgid "couldn't strdup in execbackend"
 msgstr "impossibile fare strdup in execbackend"
 
-#: src/main.c:455
+#: src/main.c:457
 #, c-format
 msgid "failed to exec %s"
 msgstr "impossibile eseguire %s"
 
-#: src/main.c:467
+#: src/main.c:469
 msgid "--command-fd takes 1 argument, not 0"
 msgstr "--command-fd accetta un parametro, non nessuno"
 
-#: src/main.c:468
+#: src/main.c:470
 msgid "--command-fd only takes 1 argument"
 msgstr "--command-fd accetta un solo parametro"
 
-#: src/main.c:470
+#: src/main.c:472
 msgid "invalid number for --command-fd"
 msgstr "numero non valido in --command-fd"
 
-#: src/main.c:472
+#: src/main.c:474
 #, c-format
 msgid "couldn't open `%i' for stream"
 msgstr "impossibile aprire `%i' per ricevere il flusso"
 
-#: src/main.c:497
+#: src/main.c:499
 #, c-format
 msgid "unexpected eof before end of line %d"
 msgstr "eof inaspettato prima della fine della linea %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 "è necessaria una opzione che indichi che azione svolgere"
 
@@ -2995,46 +2995,31 @@ msgstr ""
 "Usa dpkg --info (= dpkg-deb --info) per esaminare i file archivio,\n"
 "e dpkg --contents (= dpkg-deb --contents) per mostrarne il contenuto.\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 "' strumento per esaminare la situazione dei pacchetti\n"
 
-#: src/query.c:473
-#, c-format
-msgid "Usage: "
-msgstr "Uso: "
-
-#: 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 ""
 "Comando:\n"
 "  -s|--status <pacchetto> ...      mostra nel dettaglio lo stato del "
@@ -3061,10 +3046,25 @@ msgstr ""
 "  saranno allineati a destra a meno ché non sia specificata una\n"
 "  dimensione negativa, nel qual caso verranno allineati a sinistra.\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 ""
 "Usa --help per un aiuto sull'esaminare i pacchetti;\n"
@@ -4138,106 +4138,100 @@ msgid "menu"
 msgstr "menù"
 
 #: 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' interfaccia visuale alla gestione dei pacchetti."
 
 #: 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 ""
-"Versione %s.\n"
-"Copyright (C) 1994-1996 Ian Jackson.\n"
-"Copyright (C) 2000,2001 Wichert Akkerman.\n"
-"Questo è software libero; vedi la GNU General Public Licence\n"
-"versione 2 o successive per le condizioni di copia.\n"
-"NON c'è alcuna garanzia. Vedi dselect --licence per i dettagli.\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 ""
-"Uso: dselect [opzioni]\n"
-"     dselect [opzioni] azione ...\n"
-"Opzioni:  --admindir <directory>  (per default è /var/lib/dpkg)\n"
-"          --help  --version  --licence  --expert  --debug <file> | -D<file>\n"
-"          --colour settore:[testo],[sfondo][:attr[+attr+..]]\n"
-"Azioni:   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 "Settori schermata:\n"
 
-#: dselect/main.cc:182
+#: dselect/main.cc:192
 #, c-format
 msgid "Colours:\n"
 msgstr "Colori:\n"
 
-#: dselect/main.cc:187
+#: dselect/main.cc:197
 #, c-format
 msgid "Attributes:\n"
 msgstr "Attributi:\n"
 
-#: dselect/main.cc:207
+#: dselect/main.cc:217
 #, c-format
 msgid "couldn't open debug file `%.255s'\n"
 msgstr "impossibile aprire il file di debug `%.255s'\n"
 
-#: dselect/main.cc:222
+#: dselect/main.cc:232
 #, c-format
 msgid "Invalid %s `%s'\n"
 msgstr "Elemento non valido per tabella %s: '%s'\n"
 
-#: dselect/main.cc:239
+#: dselect/main.cc:249
 msgid "screen part"
 msgstr "settore schermata"
 
-#: dselect/main.cc:245
+#: dselect/main.cc:255
 msgid "Null colour specification\n"
 msgstr "Specificato un colore nullo\n"
 
-#: dselect/main.cc:253 dselect/main.cc:258
+#: dselect/main.cc:263 dselect/main.cc:268
 msgid "colour"
 msgstr "colore"
 
-#: dselect/main.cc:266
+#: dselect/main.cc:276
 msgid "colour attribute"
 msgstr "attributo colore"
 
-#: dselect/main.cc:300
+#: dselect/main.cc:310
 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:302
+#: dselect/main.cc:312
 msgid "Terminal does not appear to support highlighting.\n"
 msgstr "Il terminale non sembra in grado di gestire l'evidenziazione.\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 ""
 "Imposta correttamente la variabile TERM, utilizza un terminale migliore,\n"
 "oppure usa lo strumento di base per la gestione dei pacchetti, "
 
-#: dselect/main.cc:306
+#: dselect/main.cc:317
 msgid "terminal lacks necessary features, giving up"
 msgstr "il terminale manca delle funzionalità necessarie, lascio perdere"
 
-#: dselect/main.cc:384
+#: dselect/main.cc:395
 msgid ""
 "\n"
 "\n"
@@ -4252,7 +4246,7 @@ msgstr ""
 "Premi <invio> per confermare la selezione.   ^L ridisegna la schermata.\n"
 "\n"
 
-#: dselect/main.cc:398
+#: dselect/main.cc:410
 msgid ""
 "\n"
 "\n"
@@ -4262,11 +4256,11 @@ msgstr ""
 "\n"
 "Accesso in sola lettura: è possibile solo visionare le selezioni!"
 
-#: dselect/main.cc:417
+#: dselect/main.cc:429
 msgid "failed to getch in main menu"
 msgstr "impossibile eseguire getch nel menù principale"
 
-#: dselect/main.cc:490
+#: dselect/main.cc:502
 #, c-format
 msgid "unknown action string `%.50s'"
 msgstr "stringa di azione sconosciuta `%.50s'"
@@ -5514,62 +5508,44 @@ msgstr "Errore nel formato"
 msgid "--contents takes exactly one argument"
 msgstr "--contents accetta esattamente un parametro"
 
-#: 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 "' programma di gestione degli archivi di pacchetti versione "
 
-#: 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 ""
-"Questo è software libero; vedi la GNU General Public Licence versione 2\n"
-"o successiva per le condizioni di copia. NON c'è alcuna garanzia.\n"
-"Vedi dpkg-deb --licence per i dettagli.\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"
-"\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"
+"  -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"
-"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 ""
 "Comando:\n"
 "  -b|--build <directory> [<deb>]    costruisce un archivio.\n"
@@ -5612,7 +5588,16 @@ msgstr ""
 "dei pacchetti.  I pacchetti estratti usando `dpkg-deb --extract'\n"
 "verranno installati in maniera anomala !\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."
@@ -5620,7 +5605,7 @@ msgstr ""
 "Usa dpkg-deb --help per un aiuto sulla manipolazione dei file *.deb;\n"
 "Usa dpkg --help per un aiuto sull'installazione e rimozione dei pacchetti."
 
-#: dpkg-deb/main.c:176
+#: dpkg-deb/main.c:181
 #, c-format
 msgid "unknown compression type `%s'!"
 msgstr "tipo di compressione sconosciuto `%s'!"
@@ -5796,44 +5781,42 @@ msgstr "--join richiede uno o più nomi di porzioni di archivio come parametri"
 msgid "part %d is missing"
 msgstr "la porzione %d è mancante"
 
-#: 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' strumento per lo split/join dei pacchetti; "
 "versione "
 
-#: 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.  Questo è software libero; vedi la\n"
-"GNU General Public Licence versione 2 o successiva per le condizioni di "
-"copia.\n"
-"NON c'è alcuna garanzia.  Vedi dpkg-split --licence per i dettagli.\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 ""
@@ -5861,30 +5844,30 @@ msgstr ""
 "\n"
 "Stato di uscita: 0 = OK;  1 = -a non è una porzione;  2 = problemi!\n"
 
-#: dpkg-split/main.c:69
+#: dpkg-split/main.c:75
 msgid "Type dpkg-split --help for help."
 msgstr "Esegui dpkg-split --help per un aiuto."
 
-#: dpkg-split/main.c:79
+#: dpkg-split/main.c:85
 #, c-format
 msgid "error reading %s"
 msgstr "errore leggendo %s"
 
-#: dpkg-split/main.c:83
+#: dpkg-split/main.c:89
 #, c-format
 msgid "error reading %.250s"
 msgstr "errore leggendo %.250s"
 
-#: dpkg-split/main.c:84
+#: dpkg-split/main.c:90
 #, c-format
 msgid "unexpected end of file in %.250s"
 msgstr "inaspettata fine del file in %.250s"
 
-#: dpkg-split/main.c:104
+#: dpkg-split/main.c:110
 msgid "part size is far too large or is not positive"
 msgstr "la dimensione della porzione è di gran lunga troppo grande o negativa"
 
-#: 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 ""
@@ -6023,3 +6006,66 @@ msgstr "il file sorgente `%.250s' non è un file normale"
 #: dpkg-split/split.c:70
 msgid "unable to exec mksplit"
 msgstr "impossibile eseguire 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 ""
+#~ "Questo è software libero; vedi la GNU General Public Licence versione 2\n"
+#~ "o successiva per le condizioni di copia. NON c'è alcuna garanzia.\n"
+#~ "Vedi "
+
+#~ msgid " --licence for copyright and license details.\n"
+#~ msgstr " --licence per il copyright ed i dettagli sulla licenza.\n"
+
+#~ msgid "Debian `"
+#~ msgstr "Debian `"
+
+#~ msgid "Usage: "
+#~ msgstr "Uso: "
+
+#~ 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 ""
+#~ "Versione %s.\n"
+#~ "Copyright (C) 1994-1996 Ian Jackson.\n"
+#~ "Copyright (C) 2000,2001 Wichert Akkerman.\n"
+#~ "Questo è software libero; vedi la GNU General Public Licence\n"
+#~ "versione 2 o successive per le condizioni di copia.\n"
+#~ "NON c'è alcuna garanzia. Vedi dselect --licence per i dettagli.\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 ""
+#~ "Uso: dselect [opzioni]\n"
+#~ "     dselect [opzioni] azione ...\n"
+#~ "Opzioni:  --admindir <directory>  (per default è /var/lib/dpkg)\n"
+#~ "          --help  --version  --licence  --expert  --debug <file> | -"
+#~ "D<file>\n"
+#~ "          --colour settore:[testo],[sfondo][:attr[+attr+..]]\n"
+#~ "Azioni:   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.  Questo è software libero; vedi la\n"
+#~ "GNU General Public Licence versione 2 o successiva per le condizioni di "
+#~ "copia.\n"
+#~ "NON c'è alcuna garanzia.  Vedi dpkg-split --licence per i dettagli.\n"

po/ja.po

@@ -19,7 +19,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dpkg 1.13\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-25 20:55+0900\n"
 "Last-Translator: Kenshi Muto <kmuto@debian.org>\n"
 "Language-Team: Debian Japanease List <debian-japanese@lists.debian.org>\n"
@@ -2148,91 +2148,89 @@ msgid "failed to exec rm for cleanup"
 msgstr "クリーンアップ用の rm の実行に失敗しました"
 
 #: 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 "' パッケージ管理プログラム バージョン "
 
-#: 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 ""
 "これはフリーソフトです; コピー条件については GNU 一般公有使用許諾書\n"
 "バージョン 2 もしくはそれ以降を参照してください。このソフトウェアは\n"
-"無保証です。"
-
-#: src/main.c:50 src/query.c:465
-msgid " --licence for copyright and license details.\n"
-msgstr ""
-"コピーライトとライセンスに関する詳細は --licence を参照してください。\n"
+"無保証です。詳細は dpkg-deb --licence を参照してください。\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 ""
@@ -2309,14 +2307,15 @@ msgstr ""
 "ユーザ向けパッケージ管理ツールである `dselect' または `aptitude' を使いましょ"
 "う。\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 "
@@ -2332,17 +2331,17 @@ msgstr ""
 "[*] のある物は大量の情報が出力されます。パイプを使い `less' や `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 "アクション --%s と --%s が競合します"
 
-#: src/main.c:189
+#: src/main.c:191
 #, c-format
 msgid "Warning: obsolete option `--%s'\n"
 msgstr "警告: 時代遅れのオプション `--%s'\n"
 
-#: src/main.c:197
+#: src/main.c:199
 #, c-format
 msgid ""
 "%s debugging option, --debug=<octal> or -D<octal>:\n"
@@ -2379,29 +2378,29 @@ msgstr ""
 "デバッグオプションはビットごとの OR 演算で混合されます。\n"
 "その意味や値は変更されることに注意してください。\n"
 
-#: src/main.c:216
+#: src/main.c:218
 msgid "--debug requires an octal argument"
 msgstr "--debug は 8 進数の引数がひとつ必要です。"
 
-#: src/main.c:240
+#: src/main.c:242
 #, c-format
 msgid "null package name in --ignore-depends comma-separated list `%.250s'"
 msgstr ""
 "--ignore-depends の引数 (コンマで区切られたリスト) `%.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 は正当なパッケージ名を必要とします。`%.250s' は不正です; %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 "--%s に対する不正な整数です: `%.250s'"
 
-#: src/main.c:292
+#: src/main.c:294
 #, c-format
 msgid ""
 "%s forcing options - control behaviour when problems found:\n"
@@ -2475,48 +2474,48 @@ msgstr ""
 "警告: [!] のあるオプションを使用すると、インストール時に深刻なダメージを\n"
 "受ける場合がある。[*] の付いたオプションはデフォルトで有効。\n"
 
-#: src/main.c:337
+#: src/main.c:339
 #, c-format
 msgid "unknown force/refuse option `%.*s'"
 msgstr "不明な強制・拒否 (force/refuse) オプション `%.*s'"
 
-#: src/main.c:442 src/main.c:446
+#: src/main.c:444 src/main.c:448
 msgid "couldn't malloc in execbackend"
 msgstr "バックエンドの実行で malloc に失敗しました"
 
-#: src/main.c:444 src/main.c:451
+#: src/main.c:446 src/main.c:453
 msgid "couldn't strdup in execbackend"
 msgstr "バックエンドの実行で strdup に失敗しました"
 
-#: src/main.c:455
+#: src/main.c:457
 #, c-format
 msgid "failed to exec %s"
 msgstr "%s の実行に失敗しました"
 
-#: src/main.c:467
+#: src/main.c:469
 msgid "--command-fd takes 1 argument, not 0"
 msgstr "--command-fd は 1 つの引数をとります"
 
-#: src/main.c:468
+#: src/main.c:470
 msgid "--command-fd only takes 1 argument"
 msgstr "--command-fd は引数を 1 つだけ引数をとります"
 
-#: src/main.c:470
+#: src/main.c:472
 msgid "invalid number for --command-fd"
 msgstr "--command-fd への値が不正です"
 
-#: src/main.c:472
+#: src/main.c:474
 #, c-format
 msgid "couldn't open `%i' for stream"
 msgstr "`%i' をストリームとしてオープンできませんでした"
 
-#: src/main.c:497
+#: src/main.c:499
 #, c-format
 msgid "unexpected eof before end of line %d"
 msgstr "%d 行目の行末までに予期しない eof があります"
 
-#: 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 "アクションを指定するオプションが必要です"
 
@@ -2917,46 +2916,31 @@ msgstr ""
 "その内容一覧を表示するには dpkg --contents (= dpkg-deb --contents) を使いま"
 "す。\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 "' パッケージ管理プログラムクエリツール\n"
 
-#: src/query.c:473
-#, c-format
-msgid "Usage: "
-msgstr "使い方: "
-
-#: 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 ""
 " [オプション] コマンド\n"
 "コマンド:\n"
@@ -2982,10 +2966,25 @@ msgstr ""
 "  を挿入することで、含められます。width が負 (左寄せ) ではない場合\n"
 "  を除き、フィールドは右詰めされます。\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 ""
 "パッケージのクエリについてのヘルプには、--help を使います。\n"
@@ -4006,106 +4005,99 @@ msgid "menu"
 msgstr "メニュー"
 
 #: 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' パッケージ管理フロントエンド"
 
 #: 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 ""
-"バージョン %s.\n"
-"Copyright (C) 1994-1996 Ian Jackson.  \n"
-"Copyright (C) 2000,2001 Wichert Akkerman.\n"
-"これはフリーソフトウェアです。コピー条件はGNU一般公有使用許諾書バージョン2\n"
-"またはそれ以降を参照してください。このソフトウェアは無保証です。\n"
-"詳細は dselect --licence を参照してください。\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 ""
-"用法: dselect [オプション]\n"
-"      dselect [オプション] アクション ...\n"
-"オプション: --admindir <ディレクトリ> (デフォルトは /var/lib/dpkg)\n"
-"          --help --version --licence --expert --debug <ファイル> | -D<ファイ"
-"ル>\n"
-"          --colour screenpart:[前景色],[背景色][:属性[+属性+..]]\n"
-"アクション: 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 "画面部:\n"
 
-#: dselect/main.cc:182
+#: dselect/main.cc:192
 #, c-format
 msgid "Colours:\n"
 msgstr "色:\n"
 
-#: dselect/main.cc:187
+#: dselect/main.cc:197
 #, c-format
 msgid "Attributes:\n"
 msgstr "属性:\n"
 
-#: dselect/main.cc:207
+#: dselect/main.cc:217
 #, c-format
 msgid "couldn't open debug file `%.255s'\n"
 msgstr "デバッグファイル `%.250s' をオープンできませんでした\n"
 
-#: dselect/main.cc:222
+#: dselect/main.cc:232
 #, c-format
 msgid "Invalid %s `%s'\n"
 msgstr "無効な %s `%s'\n"
 
-#: dselect/main.cc:239
+#: dselect/main.cc:249
 msgid "screen part"
 msgstr "画面部"
 
-#: dselect/main.cc:245
+#: dselect/main.cc:255
 msgid "Null colour specification\n"
 msgstr "色の指定が空です\n"
 
-#: dselect/main.cc:253 dselect/main.cc:258
+#: dselect/main.cc:263 dselect/main.cc:268
 msgid "colour"
 msgstr "色"
 
-#: dselect/main.cc:266
+#: dselect/main.cc:276
 msgid "colour attribute"
 msgstr "色属性"
 
-#: dselect/main.cc:300
+#: dselect/main.cc:310
 msgid "Terminal does not appear to support cursor addressing.\n"
 msgstr "端末がカーソル割り付けをサポートしていません。\n"
 
-#: dselect/main.cc:302
+#: dselect/main.cc:312
 msgid "Terminal does not appear to support highlighting.\n"
 msgstr "端末がハイライトをサポートしていません。\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 ""
 "TERM 環境変数を正しく設定してください。高機能な端末を使用するか、\n"
 "もしくはパッケージごとの管理ツールを使用しましょう "
 
-#: dselect/main.cc:306
+#: dselect/main.cc:317
 msgid "terminal lacks necessary features, giving up"
 msgstr "必要とする機能がこの端末にはありません。終了します"
 
-#: dselect/main.cc:384
+#: dselect/main.cc:395
 msgid ""
 "\n"
 "\n"
@@ -4119,7 +4111,7 @@ msgstr ""
 "リターンキーで選択項目を決定します。^L で画面を再描画します。\n"
 "\n"
 
-#: dselect/main.cc:398
+#: dselect/main.cc:410
 msgid ""
 "\n"
 "\n"
@@ -4129,11 +4121,11 @@ msgstr ""
 "\n"
 "リードオンリーアクセス: 選択プレビューのみ利用できます!"
 
-#: dselect/main.cc:417
+#: dselect/main.cc:429
 msgid "failed to getch in main menu"
 msgstr "メインメニューでの getch に失敗しました"
 
-#: dselect/main.cc:490
+#: dselect/main.cc:502
 #, c-format
 msgid "unknown action string `%.50s'"
 msgstr "不明なアクション文字列 `%.50s' です"
@@ -5366,62 +5358,44 @@ msgstr "フォーマットエラー"
 msgid "--contents takes exactly one argument"
 msgstr "--contents は引数を 1 つだけとります"
 
-#: 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 "' パッケージアーカイブバックエンドバージョン "
 
-#: dpkg-deb/main.c:50
+#: dpkg-deb/main.c:56
+#, 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 dpkg-deb --licence for details.\n"
-msgstr ""
-"これはフリーソフトです; コピー条件については GNU 一般公有使用許諾書\n"
-"バージョン 2 もしくはそれ以降を参照してください。このソフトウェアは\n"
-"無保証です。詳細は dpkg-deb --licence を参照してください。\n"
-
-#: dpkg-deb/main.c:58
-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 ""
 "使用方法:\n"
 "   -b|--build <ディレクトリ> [<deb>] アーカイブを作成\n"
@@ -5463,7 +5437,16 @@ msgstr ""
 "向けな `dselect' または `aptitude' を使用してください。`dpkg-deb --extract'\n"
 "を使って展開されたパッケージは正しくインストールされません!\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."
@@ -5471,7 +5454,7 @@ msgstr ""
 "*.deb ファイルの操作についてのヘルプは dpkg-deb --help を参照;\n"
 "パッケージのインストール、削除については dpkg --help を参照。"
 
-#: dpkg-deb/main.c:176
+#: dpkg-deb/main.c:181
 #, c-format
 msgid "unknown compression type `%s'!"
 msgstr "`%s' は不明な圧縮形式です!"
@@ -5641,41 +5624,40 @@ msgstr "--join は引数として 1 つ以上のパートファイルを要求
 msgid "part %d is missing"
 msgstr "パート %d がありません"
 
-#: 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' パッケージ分割/結合ツール; バージョン "
 
-#: 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.  これはフリーソフトです。コピー条件は\n"
-"GNU 一般公有使用許諾書バージョン 2 かそれ以上を参照してください。\n"
-"無保証です。詳細は dpkg-split --licence を参照してください。\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 ""
@@ -5699,30 +5681,30 @@ msgstr ""
 "\n"
 "終了ステータス: 0 = OK;  1 = -a がひとつのパートでない;  2 = 問題発生!\n"
 
-#: dpkg-split/main.c:69
+#: dpkg-split/main.c:75
 msgid "Type dpkg-split --help for help."
 msgstr "ヘルプは dpkg-split --help で参照。"
 
-#: dpkg-split/main.c:79
+#: dpkg-split/main.c:85
 #, c-format
 msgid "error reading %s"
 msgstr "%s の読み込みエラーです"
 
-#: dpkg-split/main.c:83
+#: dpkg-split/main.c:89
 #, c-format
 msgid "error reading %.250s"
 msgstr "%.250s の読み込みエラーです"
 
-#: dpkg-split/main.c:84
+#: dpkg-split/main.c:90
 #, c-format
 msgid "unexpected end of file in %.250s"
 msgstr "%.250s 内で予期しないファイルの終わりです"
 
-#: dpkg-split/main.c:104
+#: dpkg-split/main.c:110
 msgid "part size is far too large or is not positive"
 msgstr "パートサイズが大きすぎるか、または正値でありません"
 
-#: 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 ""
@@ -5857,3 +5839,68 @@ msgstr "ソースファイル `%.250s' がプレーンファイルではあり
 #: dpkg-split/split.c:70
 msgid "unable to exec mksplit"
 msgstr "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 ""
+#~ "これはフリーソフトです; コピー条件については GNU 一般公有使用許諾書\n"
+#~ "バージョン 2 もしくはそれ以降を参照してください。このソフトウェアは\n"
+#~ "無保証です。"
+
+#~ msgid " --licence for copyright and license details.\n"
+#~ msgstr ""
+#~ "コピーライトとライセンスに関する詳細は --licence を参照してください。\n"
+
+#~ msgid "Debian `"
+#~ msgstr "Debian `"
+
+#~ msgid "Usage: "
+#~ msgstr "使い方: "
+
+#~ 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 ""
+#~ "バージョン %s.\n"
+#~ "Copyright (C) 1994-1996 Ian Jackson.  \n"
+#~ "Copyright (C) 2000,2001 Wichert Akkerman.\n"
+#~ "これはフリーソフトウェアです。コピー条件はGNU一般公有使用許諾書バージョン"
+#~ "2\n"
+#~ "またはそれ以降を参照してください。このソフトウェアは無保証です。\n"
+#~ "詳細は dselect --licence を参照してください。\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 ""
+#~ "用法: dselect [オプション]\n"
+#~ "      dselect [オプション] アクション ...\n"
+#~ "オプション: --admindir <ディレクトリ> (デフォルトは /var/lib/dpkg)\n"
+#~ "          --help --version --licence --expert --debug <ファイル> | -D<ファ"
+#~ "イル>\n"
+#~ "          --colour screenpart:[前景色],[背景色][:属性[+属性+..]]\n"
+#~ "アクション: 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.  これはフリーソフトです。コピー条件"
+#~ "は\n"
+#~ "GNU 一般公有使用許諾書バージョン 2 かそれ以上を参照してください。\n"
+#~ "無保証です。詳細は dpkg-split --licence を参照してください。\n"

po/ko.po

@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dpkg 1.13\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: 2004-11-21 03:52+0900\n"
 "Last-Translator: Changwoo Ryu <cwryu@debian.org>\n"
 "Language-Team: Korean <cwryu@debian.org>\n"
@@ -2117,90 +2117,89 @@ msgid "failed to exec rm for cleanup"
 msgstr "정리를 위해 rm 실행 실패"
 
 #: src/main.c:44
-msgid "Debian GNU/Linux `"
-msgstr "데비안 GNU/리눅스 `"
-
-#: src/main.c:46
-msgid "' package management program version "
+#, fuzzy, c-format
+msgid "Debian `%s' package management program version %s.\n"
 msgstr "' 꾸러미 관리 프로그램 버전 "
 
-#: 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 ""
-"자유 소프트웨어입니다.  복사 조건은 GNU General Public License 버전 2\n"
-"혹은 그 이후 버전을 참고하십시오.  어떠한 보증도 하지 않습니다.\n"
-" "
-
-#: src/main.c:50 src/query.c:465
-msgid " --licence for copyright and license details.\n"
-msgstr "저작권 및 라이선스 관련 정보는 dpkg --licence를 참고하십시오.\n"
+"자유 소프트웨어입니다.  복사 조건에 관해서는 GNU General Public License\n"
+"version 2를 보십시오.  어떤 보증도 하지 않습니다.\n"
+"저작권 관련 정보를 보려면 dpkg --licence를 참고하십시오.\n"
 
-#: src/main.c:58
+#: 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 ""
@@ -2269,7 +2268,7 @@ msgstr ""
 "\n"
 "사용하기 편리한 꾸러미 관리를 위해 `dselect'를 사용하십시오.\n"
 
-#: src/main.c:119
+#: src/main.c:121
 #, fuzzy
 msgid ""
 "Type dpkg --help for help about installing and deinstalling packages [*];\n"
@@ -2277,7 +2276,7 @@ msgid ""
 "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 "
@@ -2292,17 +2291,17 @@ msgstr ""
 "[*]표로 표시된 옵션은 출력되는 내용이 많습니다. - `less'나 `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 "--%s 명령과 --%s 명령은 충돌합니다"
 
-#: src/main.c:189
+#: src/main.c:191
 #, c-format
 msgid "Warning: obsolete option `--%s'\n"
 msgstr "경고: `--%s' 옵션은 더 이상 사용하지 않습니다\n"
 
-#: src/main.c:197
+#: src/main.c:199
 #, c-format
 msgid ""
 "%s debugging option, --debug=<octal> or -D<octal>:\n"
@@ -2339,30 +2338,30 @@ msgstr ""
 "디버깅 옵션은 OR 비트 연산으로 조합합니다.\n"
 "각각의 의미와 값은 향후 바뀔 수 있습니다.\n"
 
-#: src/main.c:216
+#: src/main.c:218
 msgid "--debug requires an octal argument"
 msgstr "--debug 옵션에는 8진수 인수가 필요합니다"
 
-#: src/main.c:240
+#: src/main.c:242
 #, c-format
 msgid "null package name in --ignore-depends comma-separated list `%.250s'"
 msgstr ""
 "--ignore-depends 옵션의 (쉼표로 구분한) 목록에 (`%.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 옵션에는 올바른 꾸러미 이름이 필요합니다. `%.250s' 꾸러미는 "
 "올바르지 않습니다: %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 "--%s 옵션에 숫자가 잘못되었습니다: `%.250s'"
 
-#: src/main.c:292
+#: src/main.c:294
 #, c-format
 msgid ""
 "%s forcing options - control behaviour when problems found:\n"
@@ -2433,49 +2432,49 @@ msgstr ""
 "경고 - [!]가 붙은 옵션을 사용하면 설치 상태를 심각하게 망가질 수 있습니다.\n"
 "[*]가 표시된 강제 옵션은 기본값으로 켜집니다.\n"
 
-#: src/main.c:337
+#: src/main.c:339
 #, c-format
 msgid "unknown force/refuse option `%.*s'"
 msgstr "알 수 없는 force/refuse 옵션 `%.*s'"
 
-#: src/main.c:442 src/main.c:446
+#: src/main.c:444 src/main.c:448
 msgid "couldn't malloc in execbackend"
 msgstr "execbackend에서 malloc할 수 없습니다"
 
-#: src/main.c:444 src/main.c:451
+#: src/main.c:446 src/main.c:453
 msgid "couldn't strdup in execbackend"
 msgstr "execbackend에서 strdup할 수 없습니다"
 
-#: src/main.c:455
+#: src/main.c:457
 #, c-format
 msgid "failed to exec %s"
 msgstr "%s 실행이 실패했습니다"
 
-#: src/main.c:467
+#: src/main.c:469
 msgid "--command-fd takes 1 argument, not 0"
 msgstr "--command-fd 옵션은 0개가 아니라 1개의 인수를 받습니다"
 
-#: src/main.c:468
+#: src/main.c:470
 msgid "--command-fd only takes 1 argument"
 msgstr "--command-fd 옵션은 정확히 1개의 인수만 받습니다"
 
-#: src/main.c:470
+#: src/main.c:472
 msgid "invalid number for --command-fd"
 msgstr "--command-fd 옵션에 번호가 올바르지 않습니다"
 
 # fdopen() 실패 상황
-#: src/main.c:472
+#: src/main.c:474
 #, c-format
 msgid "couldn't open `%i' for stream"
 msgstr "`%i' 파일디스크립터를 스트림으로 열 수 없습니다"
 
-#: src/main.c:497
+#: src/main.c:499
 #, c-format
 msgid "unexpected eof before end of line %d"
 msgstr "%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 "명령 옵션이 필요합니다"
 
@@ -2869,46 +2868,31 @@ msgstr ""
 "아카이브 내용을 보려면 dpkg --contents를 실행하십시오 (= dpkg-deb --"
 "contents)\n"
 
-#: src/query.c:459 dpkg-deb/main.c:46
-msgid "Debian `"
-msgstr "데비안 `"
-
-#: 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 "' 꾸러미 관리 프로그램 질의 도구\n"
 
-#: src/query.c:473
-#, c-format
-msgid "Usage: "
-msgstr "사용법: "
-
-#: src/query.c:474
+#: 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 ""
 " [<옵션>] <명령>\n"
 "명령:\n"
@@ -2935,10 +2919,25 @@ msgstr ""
 "  필드의 값을 나타내는 변수를 집어 넣으면 됩니다.  각 필드는 기본적으로\n"
 "  오른쪽 정렬이 되어 표시하고, 너비값이 음수이면 왼쪽 정렬이 됩니다.\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 ""
 "꾸러미 질의에 관한 도움말은 --help 옵션을 사용하십시오.\n"
@@ -3964,105 +3963,99 @@ msgid "menu"
 msgstr "메뉴"
 
 #: 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 "데비안 `%s' 꾸러미 처리 프론트엔드."
 
 #: 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 ""
-"버전 %s.\n"
-"Copyright (C) 1994-1996 Ian Jackson.\n"
-"Copyright (C) 2000 Wichert Akkerman.\n"
-"자유 소프트웨어입니다.  복사 조건에 관해서는 GNU General Public License\n"
-"version 2를 보십시오.  어떤 보증도 하지 않습니다.\n"
-"자세한 사항을 보려면 dselect --licence를 실행하십시오.\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 ""
-"사용법: dselect [옵션]\n"
-"        dselect [옵션] 명령 ...\n"
-"옵션: --admindir <디렉토리>  (기본값은 /var/lib/dpkg)\n"
-"      --help  --version  --licence  --expert  --debug <파일> | -D<파일>\n"
-"      --colour 화면구성요소:[글자색],[바탕색][:속성[+속성+..]]\n"
-"명령: access update select install config remove quit menu\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 "화면 구성 요소:\n"
 
-#: dselect/main.cc:182
+#: dselect/main.cc:192
 #, c-format
 msgid "Colours:\n"
 msgstr "색:\n"
 
-#: dselect/main.cc:187
+#: dselect/main.cc:197
 #, c-format
 msgid "Attributes:\n"
 msgstr "속성:\n"
 
-#: dselect/main.cc:207
+#: dselect/main.cc:217
 #, c-format
 msgid "couldn't open debug file `%.255s'\n"
 msgstr "디버그 파일 `%.255s'을(를) 열 수 없습니다\n"
 
-#: dselect/main.cc:222
+#: dselect/main.cc:232
 #, c-format
 msgid "Invalid %s `%s'\n"
 msgstr "올바르지 않은 %s `%s'\n"
 
-#: dselect/main.cc:239
+#: dselect/main.cc:249
 msgid "screen part"
 msgstr "화면 구성 요소"
 
-#: dselect/main.cc:245
+#: dselect/main.cc:255
 msgid "Null colour specification\n"
 msgstr "색 지정이 없습니다\n"
 
-#: dselect/main.cc:253 dselect/main.cc:258
+#: dselect/main.cc:263 dselect/main.cc:268
 msgid "colour"
 msgstr "색"
 
-#: dselect/main.cc:266
+#: dselect/main.cc:276
 msgid "colour attribute"
 msgstr "색 속성"
 
-#: dselect/main.cc:300
+#: dselect/main.cc:310
 msgid "Terminal does not appear to support cursor addressing.\n"
 msgstr "터미널이 커서 주소 지정을 지원하지 않는 것 같습니다.\n"
 
-#: dselect/main.cc:302
+#: dselect/main.cc:312
 msgid "Terminal does not appear to support highlighting.\n"
 msgstr "터미널이 반전을 지원하지 않는 것 같습니다.\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 ""
 "TERM 변수를 정확히 설정하거나 더 나은 터미널을 사용하십시오.\n"
 "혹은 개개 꾸러미 관리 도구를 이용하십시오. "
 
-#: dselect/main.cc:306
+#: dselect/main.cc:317
 msgid "terminal lacks necessary features, giving up"
 msgstr "터미널에 필수적인 기능이 빠져 있습니다. 그만둡니다."
 
-#: dselect/main.cc:384
+#: dselect/main.cc:395
 msgid ""
 "\n"
 "\n"
@@ -4076,7 +4069,7 @@ msgstr ""
 "선택한 항목으로 들어가려면 <enter> 키를 누르십시오.   ^L은 화면을 다시 그립니"
 "다.\n"
 
-#: dselect/main.cc:398
+#: dselect/main.cc:410
 msgid ""
 "\n"
 "\n"
@@ -4086,11 +4079,11 @@ msgstr ""
 "\n"
 "읽기 전용 접근: 선택된 사항을 미리 보는 것만 가능합니다!"
 
-#: dselect/main.cc:417
+#: dselect/main.cc:429
 msgid "failed to getch in main menu"
 msgstr "주 메뉴에서 getch가 실패했습니다"
 
-#: dselect/main.cc:490
+#: dselect/main.cc:502
 #, c-format
 msgid "unknown action string `%.50s'"
 msgstr "알 수 없는 명령 문자열 `%.50s'"
@@ -5327,63 +5320,44 @@ msgid "--contents takes exactly one argument"
 msgstr "--contents 옵션은 한 개의 인수만 받습니다"
 
 # FIXME: bad msgid
-#: 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 "' 꾸러미 아카이브 백엔드 버전 "
 
-#: 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 ""
-"자유 소프트웨어입니다.  복사 조건에 관해서는 GNU General Public License\n"
-"version 2를 보십시오.  어떤 보증도 하지 않습니다.\n"
-"저작권 관련 정보를 보려면 dpkg --licence를 참고하십시오.\n"
-
-#: dpkg-deb/main.c:58
-#, fuzzy
+#: 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"
-"\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"
+"  -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"
-"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 ""
 "명령:\n"
 "  -b|--build <디렉토리> [<deb>]     아카이브를 만듭니다.\n"
@@ -5425,7 +5399,16 @@ msgstr ""
 "좀 더 사용하기 쉬운 꾸러미 관리자를 쓰려면 `dselect'를 사용하십시오.\n"
 "`dpkg-deb --extract'로 압축을 푼 꾸러미는 올바르지 않게 설치될 것입니다!\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."
@@ -5433,7 +5416,7 @@ msgstr ""
 "*.deb 파일 조작에 관한 도움말을 보려면 dpkg-deb --help를 실행하십시오.\n"
 "꾸러미 설치와 설치 해제에 관한 도움말을 보려면 dpkg --help를 실행하십시오."
 
-#: dpkg-deb/main.c:176
+#: dpkg-deb/main.c:181
 #, c-format
 msgid "unknown compression type `%s'!"
 msgstr "알 수 없는 압축 종류 `%s'!"
@@ -5601,43 +5584,40 @@ msgstr "--join 옵션에는 한 개 이상의 구성 파일 인수가 필요합
 msgid "part %d is missing"
 msgstr "구성 요소 %d번이 없습니다"
 
-#: 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 "데비안 GNU/리눅스 `dpkg-split' 꾸러미 나누기/합치기 프로그램; 버전 "
 
-#: 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.  자유 소프트웨어입니다.  복사 조건에\n"
-"관해서는 GNU General Public License version 2 혹은 그 이후 버전을 보십시"
-"오.  \n"
-"어떤 보증도 하지 않습니다.  자세한 사항을 보려면 dpkg-split --licence를\n"
-"참고하십시오.\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 ""
@@ -5661,30 +5641,30 @@ msgstr ""
 "\n"
 "끝내기 상태값: 0 = 이상 없음, 1 = -a에서 구성 요소가 아님, 2 = 문제 발생!\n"
 
-#: dpkg-split/main.c:69
+#: dpkg-split/main.c:75
 msgid "Type dpkg-split --help for help."
 msgstr "도움말을 보려면 dpkg-split --help를 실행하십시오."
 
-#: dpkg-split/main.c:79
+#: dpkg-split/main.c:85
 #, c-format
 msgid "error reading %s"
 msgstr "%s 파일을 읽는 데 오류가 발생했습니다"
 
-#: dpkg-split/main.c:83
+#: dpkg-split/main.c:89
 #, c-format
 msgid "error reading %.250s"
 msgstr "%.250s 파일을 읽는 데 오류가 발생했습니다"
 
-#: dpkg-split/main.c:84
+#: dpkg-split/main.c:90
 #, c-format
 msgid "unexpected end of file in %.250s"
 msgstr "%.250s 파일에서 예상치 못하게 파일이 끝났습니다"
 
-#: dpkg-split/main.c:104
+#: dpkg-split/main.c:110
 msgid "part size is far too large or is not positive"
 msgstr "구성 요소의 크기가 너무 크거나 0보다 큰 수가 아닙니다"
 
-#: 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 ""
@@ -5822,6 +5802,70 @@ msgstr "`%.250s' 소스 파일이 일반 파일이 아닙니다"
 msgid "unable to exec mksplit"
 msgstr "mksplit 실행이 실패했습니다"
 
+#~ msgid "Debian GNU/Linux `"
+#~ msgstr "데비안 GNU/리눅스 `"
+
+#~ 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 ""
+#~ "자유 소프트웨어입니다.  복사 조건은 GNU General Public License 버전 2\n"
+#~ "혹은 그 이후 버전을 참고하십시오.  어떠한 보증도 하지 않습니다.\n"
+#~ " "
+
+#~ msgid " --licence for copyright and license details.\n"
+#~ msgstr "저작권 및 라이선스 관련 정보는 dpkg --licence를 참고하십시오.\n"
+
+#~ msgid "Debian `"
+#~ msgstr "데비안 `"
+
+#~ msgid "Usage: "
+#~ msgstr "사용법: "
+
+#~ 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 ""
+#~ "버전 %s.\n"
+#~ "Copyright (C) 1994-1996 Ian Jackson.\n"
+#~ "Copyright (C) 2000 Wichert Akkerman.\n"
+#~ "자유 소프트웨어입니다.  복사 조건에 관해서는 GNU General Public License\n"
+#~ "version 2를 보십시오.  어떤 보증도 하지 않습니다.\n"
+#~ "자세한 사항을 보려면 dselect --licence를 실행하십시오.\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 ""
+#~ "사용법: dselect [옵션]\n"
+#~ "        dselect [옵션] 명령 ...\n"
+#~ "옵션: --admindir <디렉토리>  (기본값은 /var/lib/dpkg)\n"
+#~ "      --help  --version  --licence  --expert  --debug <파일> | -D<파일>\n"
+#~ "      --colour 화면구성요소:[글자색],[바탕색][:속성[+속성+..]]\n"
+#~ "명령: access update select install config remove quit menu\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.  자유 소프트웨어입니다.  복사 조건"
+#~ "에\n"
+#~ "관해서는 GNU General Public License version 2 혹은 그 이후 버전을 보십시"
+#~ "오.  \n"
+#~ "어떤 보증도 하지 않습니다.  자세한 사항을 보려면 dpkg-split --licence를\n"
+#~ "참고하십시오.\n"
+
 #~ msgid "Type md5sum --help for help."
 #~ msgstr "도움말을 보려면 md5sum --help를 실행하십시오."
 

po/nb.po

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dpkg 1.13\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: 2005-08-22 15:47+0100\n"
 "Last-Translator: Hans Fredrik Nordhaug <hans@nordhaug.priv.no>\n"
 "Language-Team: Norwegian Bokmål <i18n-nb@lister.ping.ui.no>\n"
@@ -2115,90 +2115,89 @@ msgid "failed to exec rm for cleanup"
 msgstr "klarte ikke kjøre «rm» for opprydding"
 
 #: 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 "» pakkehåndteringsprogram, versjon "
 
-#: 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 fri programvare, se «GNU General Public License» versjon 2 eller\n"
-"nyere for kopieringsvilkår. Det finnes INGEN garanti.\n"
-"Se"
-
-#: src/main.c:50 src/query.c:465
-msgid " --licence for copyright and license details.\n"
-msgstr " --licence for informasjon om opphavsrett og lisens.\n"
+"Dette er fri programvare. Du finner kopieringsvilkårene i\n"
+"GNU General Public Licence versjon 2 eller nyere. Det finnes INGEN garanti.\n"
+"Se «dpkg-deb --licence» for detaljer.\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 ""
 "Bruk «dselect» eller «aptitude»for en litt mer brukervennlig "
 "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 ""
 "Valg markert med [*] gir mye tekst - bruk «less» eller «more» for å lese "
 "informasjonen!"
 
-#: 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 "handlinger i konflikt --%s og --%s"
 
-#: src/main.c:189
+#: src/main.c:191
 #, c-format
 msgid "Warning: obsolete option `--%s'\n"
 msgstr "Advarsel: Foreldet opsjon  «%s»\n"
 
-#: src/main.c:197
+#: src/main.c:199
 #, c-format
 msgid ""
 "%s debugging option, --debug=<octal> or -D<octal>:\n"
@@ -2356,27 +2356,27 @@ msgstr ""
 "Avlusingsopsjonene kan kombineres med logisk eller.\n"
 "Legg merke til at betydninger og verdier kan bli endret.\n"
 
-#: src/main.c:216
+#: src/main.c:218
 msgid "--debug requires an octal argument"
 msgstr "-- debug krever en oktal 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 den kommadelte lista til --ignore-depends «%.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 krever et gyldig pakkenavn. «%.250s» er ikke gyldig; %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 "ugyldig heltall for --%s: «%.250s»"
 
-#: src/main.c:292
+#: src/main.c:294
 #, c-format
 msgid ""
 "%s forcing options - control behaviour when problems found:\n"
@@ -2452,48 +2452,48 @@ msgstr ""
 "ADVARSEL - Funksjoner merket med [!] kan ødelegge installasjonen alvorlig.\n"
 "Opsjoner som er merket med [*] er slått på som standard.\n"
 
-#: src/main.c:337
+#: src/main.c:339
 #, c-format
 msgid "unknown force/refuse option `%.*s'"
 msgstr "ukjent tvangs-/avvisningsopsjon «%.*s»"
 
-#: src/main.c:442 src/main.c:446
+#: src/main.c:444 src/main.c:448
 msgid "couldn't malloc in execbackend"
 msgstr "klarte ikke utfø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 "klarte ikke utføre «strdup» i execbackend"
 
-#: src/main.c:455
+#: src/main.c:457
 #, c-format
 msgid "failed to exec %s"
 msgstr "klarte ikke kjøre %s"
 
-#: src/main.c:467
+#: src/main.c:469
 msgid "--command-fd takes 1 argument, not 0"
 msgstr "--command-fd tar ett argument, ikke 0"
 
-#: src/main.c:468
+#: src/main.c:470
 msgid "--command-fd only takes 1 argument"
 msgstr "--command-fd tar bare ett argument"
 
-#: src/main.c:470
+#: src/main.c:472
 msgid "invalid number for --command-fd"
 msgstr "ugyldig tall for --command-fd"
 
-#: src/main.c:472
+#: src/main.c:474
 #, c-format
 msgid "couldn't open `%i' for stream"
 msgstr "klarte ikke åpne «%i» for strøm"
 
-#: src/main.c:497
+#: src/main.c:499
 #, c-format
 msgid "unexpected eof before end of line %d"
 msgstr "uventet slutt på fil før slutten av 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 "trenger et handlingsvalg"
 
@@ -2880,46 +2880,31 @@ msgstr ""
 "Bruk dpkg --info (= dpkg-deb --info) for å undersøke arkivfiler,\n"
 "og dpkg --contents (= dpkg-deb --contents) for å vise innholdet i dem.\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 og spørreverktøy\n"
 
-#: src/query.c:473
-#, c-format
-msgid "Usage: "
-msgstr "Bruk: "
-
-#: 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 ""
 " [<alternativ>] <kommando>\n"
 "Kommandoer:\n"
@@ -2946,10 +2931,25 @@ msgstr ""
 "  ${var[;bredde]}. Feltene vil være høyrejusterte, med mindre bredden er \n"
 "negativ. I så fall vil de være venstrejusterte.\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 ""
 "Bruk --hjelp for hjelp om pakkespørring.\n"
@@ -3989,105 +3989,99 @@ msgid "menu"
 msgstr "meny"
 
 #: 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', brukergrensesnitt for 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 ""
-"Versjon %s.\n"
-"Opphavsrett (C) 1994-1996 Ian Jackson.\n"
-"Opphavsrett (C) 2000,20001 Wichert Akkerman.\n"
-"Dette er fri programvare, se GNU General Public Licence versjon 2\n"
-"eller senere for kopieringsvilkår. Det er INGEN garanti. Se\n"
-"dselect --licence for detaljer.\n"
-
-#: dselect/main.cc:169
+msgstr ""
+
+#: 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 ""
-"Bruk: dselect [opsjoner]\n"
-"      dselect [opsjoner] handling ...\n"
-"Opsjoner:  --admindir <katalog>  (standard er /var/lib/dpkg)\n"
-"      --help  --version  --licence  --expert  --debug <fil> | -D<fil>\n"
-"      --colour skjermdel:[foreground],[background][:attr[+attr+..]]\n"
-"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 "Skjermdeler:\n"
 
-#: dselect/main.cc:182
+#: dselect/main.cc:192
 #, c-format
 msgid "Colours:\n"
 msgstr "Farger:\n"
 
-#: dselect/main.cc:187
+#: dselect/main.cc:197
 #, c-format
 msgid "Attributes:\n"
 msgstr "Attributter:\n"
 
-#: dselect/main.cc:207
+#: dselect/main.cc:217
 #, c-format
 msgid "couldn't open debug file `%.255s'\n"
 msgstr "klarte ikke åpne avlusingsfil `%.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 "skjermdel"
 
-#: dselect/main.cc:245
+#: dselect/main.cc:255
 msgid "Null colour specification\n"
 msgstr "Ingen fargespesifikasjon\n"
 
-#: dselect/main.cc:253 dselect/main.cc:258
+#: dselect/main.cc:263 dselect/main.cc:268
 msgid "colour"
 msgstr "farge"
 
-#: dselect/main.cc:266
+#: dselect/main.cc:276
 msgid "colour attribute"
 msgstr "fargeattributt"
 
-#: dselect/main.cc:300
+#: dselect/main.cc:310
 msgid "Terminal does not appear to support cursor addressing.\n"
 msgstr "Terminalen ser ikke ut til å støtte markøradressering.\n"
 
-#: dselect/main.cc:302
+#: dselect/main.cc:312
 msgid "Terminal does not appear to support highlighting.\n"
 msgstr "Terminalen ser ikke ut til å støtte utheving.\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 ""
 "Sett TERM-variabelen riktig, bruk en bedre terminal eller \n"
 "du får klare deg med håndteringsverktøyet for hver pakke "
 
-#: dselect/main.cc:306
+#: dselect/main.cc:317
 msgid "terminal lacks necessary features, giving up"
 msgstr "terminalen mangler nødvendige funksjoner, gir opp"
 
-#: dselect/main.cc:384
+#: dselect/main.cc:395
 msgid ""
 "\n"
 "\n"
@@ -4102,7 +4096,7 @@ msgstr ""
 "Trykk <enter> for å bekrefte utvalget.   ^L tegner skjermen på nytt.\n"
 "\n"
 
-#: dselect/main.cc:398
+#: dselect/main.cc:410
 msgid ""
 "\n"
 "\n"
@@ -4112,11 +4106,11 @@ msgstr ""
 "\n"
 "Skrivebeskyttet tilgang: bare forhåndsvisning av utvalg er tilgjengelig!"
 
-#: dselect/main.cc:417
+#: dselect/main.cc:429
 msgid "failed to getch in main menu"
 msgstr "klarte ikke bruke «getch» i hovedmenyen"
 
-#: dselect/main.cc:490
+#: dselect/main.cc:502
 #, c-format
 msgid "unknown action string `%.50s'"
 msgstr "ukjent handlingsstreng `%.50s'"
@@ -5339,62 +5333,44 @@ msgstr "Feil i format"
 msgid "--contents takes exactly one argument"
 msgstr "--contents tar akkurat én 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 "' versjon for pakkearkivets bakgrunnsmotor "
 
-#: 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 fri programvare. Du finner kopieringsvilkårene i\n"
-"GNU General Public Licence versjon 2 eller nyere. Det finnes INGEN garanti.\n"
-"Se «dpkg-deb --licence» for detaljer.\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"
-"\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"
+"  -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"
-"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 <katalog> [<deb>]      Bygg et arkiv.\n"
@@ -5435,7 +5411,16 @@ msgstr ""
 "«dselect» eller «aptitude» for brukervennlig pakkehåndtering. Pakker\n"
 "som er pakket ut med «dpkg-deb --extract» vil ikke bli installert riktig.\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."
@@ -5443,7 +5428,7 @@ msgstr ""
 "Skriv «dpkg-deb --help» for hjelp med endring av *.deb-filer.\n"
 "Skriv «dpkg --help» for hjelp med å installere og avinstallere pakker."
 
-#: dpkg-deb/main.c:176
+#: dpkg-deb/main.c:181
 #, c-format
 msgid "unknown compression type `%s'!"
 msgstr "ukjent koprimeringstype «%s»!"
@@ -5608,43 +5593,42 @@ msgstr "--join tar en eller flere delfilparametre"
 msgid "part %d is missing"
 msgstr "delen %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», verktøy for pakkedeling og sammensetting, "
 "versjon "
 
-#: 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 ""
-"Opphavsrett (C) 1994-1996 Ian Jackson. Dette er fri programvare. Se\n"
-"GNU General Public Licence versjon 2 eller nyere for kopieringsvilkår.\n"
-"Det er INGEN garanti. Du finner flere detaljer i «dpkg-split --licence».\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 ""
@@ -5668,30 +5652,30 @@ msgstr ""
 "\n"
 "Avslutningstatus: 0 = OK;  1 = -a er ikke en del;  2 = problem!\n"
 
-#: dpkg-split/main.c:69
+#: dpkg-split/main.c:75
 msgid "Type dpkg-split --help for help."
 msgstr "Skriv «dpkg-split --help» for hjelp."
 
-#: dpkg-split/main.c:79
+#: dpkg-split/main.c:85
 #, c-format
 msgid "error reading %s"
 msgstr "feil ved lesing av %s"
 
-#: dpkg-split/main.c:83
+#: dpkg-split/main.c:89
 #, c-format
 msgid "error reading %.250s"
 msgstr "feil ved lesing av %.250s"
 
-#: dpkg-split/main.c:84
+#: dpkg-split/main.c:90
 #, c-format
 msgid "unexpected end of file in %.250s"
 msgstr "uventet slutt på fil 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 altfor 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 må minst være på %dk (for at hodet skal få plass)"
@@ -5827,6 +5811,68 @@ msgstr "kildefila «%.250s» er ikke en vanlig fil"
 msgid "unable to exec mksplit"
 msgstr "klarte ikke kjø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 fri programvare, se «GNU General Public License» versjon 2 "
+#~ "eller\n"
+#~ "nyere for kopieringsvilkår. Det finnes INGEN garanti.\n"
+#~ "Se"
+
+#~ msgid " --licence for copyright and license details.\n"
+#~ msgstr " --licence for informasjon om opphavsrett og lisens.\n"
+
+#~ msgid "Debian `"
+#~ msgstr "Debian «"
+
+#~ msgid "Usage: "
+#~ msgstr "Bruk: "
+
+#~ 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 ""
+#~ "Versjon %s.\n"
+#~ "Opphavsrett (C) 1994-1996 Ian Jackson.\n"
+#~ "Opphavsrett (C) 2000,20001 Wichert Akkerman.\n"
+#~ "Dette er fri programvare, se GNU General Public Licence versjon 2\n"
+#~ "eller senere for kopieringsvilkår. Det 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 ""
+#~ "Bruk: dselect [opsjoner]\n"
+#~ "      dselect [opsjoner] handling ...\n"
+#~ "Opsjoner:  --admindir <katalog>  (standard er /var/lib/dpkg)\n"
+#~ "      --help  --version  --licence  --expert  --debug <fil> | -D<fil>\n"
+#~ "      --colour skjermdel:[foreground],[background][:attr[+attr+..]]\n"
+#~ "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 ""
+#~ "Opphavsrett (C) 1994-1996 Ian Jackson. Dette er fri programvare. Se\n"
+#~ "GNU General Public Licence versjon 2 eller nyere for kopieringsvilkår.\n"
+#~ "Det er INGEN garanti. Du finner flere detaljer i «dpkg-split --licence».\n"
+
 #~ msgid "Type md5sum --help for help."
 #~ msgstr "Skriv «md5sum --help» for hjelp."
 

po/nl.po

@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dpkg 1.9.4\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: 2005-08-18 18:23+0100\n"
 "Last-Translator: Bart Cornelis <cobaco@linux.be>\n"
 "Language-Team: Dutch <debian-l10n-dutch@debian.org>\n"
@@ -2141,90 +2141,89 @@ msgid "failed to exec rm for cleanup"
 msgstr "kon rm niet uitvoeren om op te ruimen"
 
 #: 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 "' beheerprogramma voor pakketten versie "
 
-#: 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 ""
 "Dit is vrije programmatuur; zie de GNU General Public Licence versie 2\n"
 "of later voor kopieervoorwaarden.  Er is GEEN garantie.\n"
-"Zie "
-
-#: src/main.c:50 src/query.c:465
-msgid " --licence for copyright and license details.\n"
-msgstr " --licence voor copyright en licentie details.\n"
+"Zie dpkg --licence voor auteursrechten en licentiedetails.\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 ""
@@ -2298,14 +2297,15 @@ msgstr ""
 "\n"
 "Gebruik `dselect' of 'aptitude' voor gebruikersvriendelijk pakketbeheer.\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 "
@@ -2323,17 +2323,17 @@ msgstr ""
 "Opties gemarkeerd met [*] produceren een hoop uitvoer - pijp het door `less' "
 "of `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 "tegenstrijdige acties --%s en --%s"
 
-#: src/main.c:189
+#: src/main.c:191
 #, c-format
 msgid "Warning: obsolete option `--%s'\n"
 msgstr "Let op: verouderde optie `--%s'\n"
 
-#: src/main.c:197
+#: src/main.c:199
 #, c-format
 msgid ""
 "%s debugging option, --debug=<octal> or -D<octal>:\n"
@@ -2370,28 +2370,28 @@ msgstr ""
 "Debug-opties kunnen worden gecombineerd met bitsgewijze of.\n"
 "Merk op dat de betekenissen en waarden kunnen veranderen.\n"
 
-#: src/main.c:216
+#: src/main.c:218
 msgid "--debug requires an octal argument"
 msgstr "--debug vereist een octaal argument"
 
-#: src/main.c:240
+#: src/main.c:242
 #, c-format
 msgid "null package name in --ignore-depends comma-separated list `%.250s'"
 msgstr ""
 "lege pakketnaam in --ignore-depends lijst `%.250s' (gescheiden door komma's)"
 
-#: 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 vereist een toegestane pakketnaam. `%.250s' is dat niet; %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 "ongeldig getal voor --%s: `%.250s'"
 
-#: src/main.c:292
+#: src/main.c:294
 #, c-format
 msgid ""
 "%s forcing options - control behaviour when problems found:\n"
@@ -2478,48 +2478,48 @@ msgstr ""
 "ernstig beschadigen.\n"
 "Forceeropties gemarkeerd met [*] staan standaard aan.\n"
 
-#: src/main.c:337
+#: src/main.c:339
 #, c-format
 msgid "unknown force/refuse option `%.*s'"
 msgstr "onbekende force/refuse optie `%.*s'"
 
-#: src/main.c:442 src/main.c:446
+#: src/main.c:444 src/main.c:448
 msgid "couldn't malloc in execbackend"
 msgstr "kon geen geheugen reserveren in exec-backend"
 
-#: src/main.c:444 src/main.c:451
+#: src/main.c:446 src/main.c:453
 msgid "couldn't strdup in execbackend"
 msgstr "strdup is mislukt in exec-backend"
 
-#: src/main.c:455
+#: src/main.c:457
 #, c-format
 msgid "failed to exec %s"
 msgstr "kon %s niet uitvoeren"
 
-#: src/main.c:467
+#: src/main.c:469
 msgid "--command-fd takes 1 argument, not 0"
 msgstr "--command-fd verwacht een argument, niet nul"
 
-#: src/main.c:468
+#: src/main.c:470
 msgid "--command-fd only takes 1 argument"
 msgstr "--command-fd verwacht slechts één argument"
 
-#: src/main.c:470
+#: src/main.c:472
 msgid "invalid number for --command-fd"
 msgstr "ongeldig nummer voor --command-fd"
 
-#: src/main.c:472
+#: src/main.c:474
 #, c-format
 msgid "couldn't open `%i' for stream"
 msgstr "kon `%i' niet openen voor stream"
 
-#: src/main.c:497
+#: src/main.c:499
 #, c-format
 msgid "unexpected eof before end of line %d"
 msgstr "onverwacht bestandseinde voor einde regel %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 "heb een actie-optie nodig"
 
@@ -2906,46 +2906,31 @@ msgstr ""
 "Gebruik dpkg --info (= dpkg-deb --info) om archiefbestanden te bekijken,\n"
 "en dpkg --contents (= dpkg-deb --contents) om de inhoud weer te geven.\n"
 
-#: src/query.c:459 dpkg-deb/main.c:46
-msgid "Debian `"
-msgstr "Debian GNU/Linux `"
-
-#: 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 "' beheerprogramma voor pakketten versie\n"
 
-#: src/query.c:473
-#, c-format
-msgid "Usage: "
-msgstr "Gebruik: "
-
-#: 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 ""
 " [<optie>] <commando>\n"
 "Commandos:\n"
@@ -2973,10 +2958,25 @@ msgstr ""
 "  Velden worden rechts uitgelijnd tenzij de breedte negatief is, in dat\n"
 "  geval worden ze links uitgelijnd.\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 ""
 "Gebruik --help voor hulp i.v.m. het bevragen van pakketten;\n"
@@ -4024,105 +4024,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' pakketbeheerprogramma."
 
 #: 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 ""
-"Versie %s.\n"
-"Copyright (C) 1994-1996 Ian Jackson.\n"
-"Copyright (C) 2000,2001 Wichert Akkerman.\n"
-"Dit is vrije programmatuur; zie de GNU General Public License versie 2\n"
-"of later voor kopieervoorwaarden.  Er is GEEN garantie.  Zie dselect\n"
-"--license voor details.\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 ""
-"Gebruik: dselect [opties]\n"
-"         dselect [opties] actie ...\n"
-"Opties:  --admindir <map>  (standaard is /var/lib/dpkg)\n"
-"         --help  --versien  --licence  --expert  --debug <bestand> | -"
-"D<bestand>\n"
-"Acties:  access update select install config remove quit menu\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 "Schermdelen:\n"
 
-#: dselect/main.cc:182
+#: dselect/main.cc:192
 #, c-format
 msgid "Colours:\n"
 msgstr "Kleuren:\n"
 
-#: dselect/main.cc:187
+#: dselect/main.cc:197
 #, c-format
 msgid "Attributes:\n"
 msgstr "Attributes:\n"
 
-#: dselect/main.cc:207
+#: dselect/main.cc:217
 #, c-format
 msgid "couldn't open debug file `%.255s'\n"
 msgstr "kon debugbestand `%.255s' niet openen\n"
 
-#: dselect/main.cc:222
+#: dselect/main.cc:232
 #, c-format
 msgid "Invalid %s `%s'\n"
 msgstr "Ongeldige %s '%s'\n"
 
-#: dselect/main.cc:239
+#: dselect/main.cc:249
 msgid "screen part"
 msgstr "schermdeel"
 
-#: dselect/main.cc:245
+#: dselect/main.cc:255
 msgid "Null colour specification\n"
 msgstr "Blanco-kleur specificatie\n"
 
-#: dselect/main.cc:253 dselect/main.cc:258
+#: dselect/main.cc:263 dselect/main.cc:268
 msgid "colour"
 msgstr "kleur"
 
-#: dselect/main.cc:266
+#: dselect/main.cc:276
 msgid "colour attribute"
 msgstr "kleurattribuut"
 
-#: dselect/main.cc:300
+#: dselect/main.cc:310
 msgid "Terminal does not appear to support cursor addressing.\n"
 msgstr "Terminal lijkt de cursor niet te kunnen besturen.\n"
 
-#: dselect/main.cc:302
+#: dselect/main.cc:312
 msgid "Terminal does not appear to support highlighting.\n"
 msgstr "Terminal lijkt oplichten niet te ondersteunen.\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 ""
 "Zet uw TERM variabele goed, gebruik een betere terminal,\n"
 "of doe het met de pakketsgewijze beheerstool "
 
-#: dselect/main.cc:306
+#: dselect/main.cc:317
 msgid "terminal lacks necessary features, giving up"
 msgstr "terminal kan essentiële ... niet aan, er wordt opgegeven"
 
-#: dselect/main.cc:384
+#: dselect/main.cc:395
 msgid ""
 "\n"
 "\n"
@@ -4136,7 +4130,7 @@ msgstr ""
 "Druk op <enter> om selectie te activeren.  ^L tekent het scherm opnieuw.\n"
 "\n"
 
-#: dselect/main.cc:398
+#: dselect/main.cc:410
 msgid ""
 "\n"
 "\n"
@@ -4146,11 +4140,11 @@ msgstr ""
 "\n"
 "Toegang is alleen lezen: de selecties worden niet bewaard!"
 
-#: dselect/main.cc:417
+#: dselect/main.cc:429
 msgid "failed to getch in main menu"
 msgstr "getch in hoofdmenu is mislukt"
 
-#: dselect/main.cc:490
+#: dselect/main.cc:502
 #, c-format
 msgid "unknown action string `%.50s'"
 msgstr "onbekend actiewoord `%.50s'"
@@ -5378,62 +5372,44 @@ msgstr "Formaatfout"
 msgid "--contents takes exactly one argument"
 msgstr "--contents verwacht precies een argument"
 
-#: 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 "' pakketarchief programma versie "
 
-#: 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 ""
-"Dit is vrije programmatuur; zie de GNU General Public Licence versie 2\n"
-"of later voor kopieervoorwaarden.  Er is GEEN garantie.\n"
-"Zie dpkg --licence voor auteursrechten en licentiedetails.\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"
-"\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"
+"  -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"
-"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 ""
 "Commando:\n"
 "  -b|--build <map> [<deb>]    bouw een archief.\n"
@@ -5478,7 +5454,16 @@ msgstr ""
 "Pakketten uitgepakt met `dpkg-deb --extract' worden foutief\n"
 "geïnstalleerd!\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."
@@ -5486,7 +5471,7 @@ msgstr ""
 "Type dpkg-deb --help voor hulp bij manipuleren van *.deb bestanden;\n"
 "Type dpkg --help voor hulp bij installeren en verwijderen van pakketten."
 
-#: dpkg-deb/main.c:176
+#: dpkg-deb/main.c:181
 #, c-format
 msgid "unknown compression type `%s'!"
 msgstr "onbekend compressietype '%s'!"
@@ -5654,41 +5639,40 @@ msgstr "--join vereist een of meerdere deelbestanden als argumenten"
 msgid "part %d is missing"
 msgstr "deel %d ontbreekt"
 
-#: 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' pakket splits-/samenvoegmiddel; versie "
 
-#: 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.  Dit is vrije programmatuur; zie\n"
-"de GNU General Public License versie 2 of later voor kopieervoorwaarden.\n"
-"Er is GEEN garantie.  Zie dpkg-split --licence voor details.\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 ""
@@ -5711,30 +5695,30 @@ msgstr ""
 "\n"
 "Statuscode: 0 = OK;  1 = -a is geen deel;  2 = moeilijkheden!\n"
 
-#: dpkg-split/main.c:69
+#: dpkg-split/main.c:75
 msgid "Type dpkg-split --help for help."
 msgstr "Type dpkg-split --help voor hulp."
 
-#: dpkg-split/main.c:79
+#: dpkg-split/main.c:85
 #, c-format
 msgid "error reading %s"
 msgstr "fout bij lezen %s"
 
-#: dpkg-split/main.c:83
+#: dpkg-split/main.c:89
 #, c-format
 msgid "error reading %.250s"
 msgstr "fout bij schrijven %.250s"
 
-#: dpkg-split/main.c:84
+#: dpkg-split/main.c:90
 #, c-format
 msgid "unexpected end of file in %.250s"
 msgstr "onverwachts bestandseinde in %.250s"
 
-#: dpkg-split/main.c:104
+#: dpkg-split/main.c:110
 msgid "part size is far too large or is not positive"
 msgstr "deel is te groot of niet positief"
 
-#: 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 "deel moet ten minste %dk groot zijn (voor informatie)"
@@ -5869,6 +5853,67 @@ msgstr "bronbestand `%.250s' is geen gewoon bestand"
 msgid "unable to exec mksplit"
 msgstr "kon mksplit niet uitvoeren"
 
+#~ 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 ""
+#~ "Dit is vrije programmatuur; zie de GNU General Public Licence versie 2\n"
+#~ "of later voor kopieervoorwaarden.  Er is GEEN garantie.\n"
+#~ "Zie "
+
+#~ msgid " --licence for copyright and license details.\n"
+#~ msgstr " --licence voor copyright en licentie details.\n"
+
+#~ msgid "Debian `"
+#~ msgstr "Debian GNU/Linux `"
+
+#~ msgid "Usage: "
+#~ msgstr "Gebruik: "
+
+#~ 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 ""
+#~ "Versie %s.\n"
+#~ "Copyright (C) 1994-1996 Ian Jackson.\n"
+#~ "Copyright (C) 2000,2001 Wichert Akkerman.\n"
+#~ "Dit is vrije programmatuur; zie de GNU General Public License versie 2\n"
+#~ "of later voor kopieervoorwaarden.  Er is GEEN garantie.  Zie dselect\n"
+#~ "--license voor details.\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 ""
+#~ "Gebruik: dselect [opties]\n"
+#~ "         dselect [opties] actie ...\n"
+#~ "Opties:  --admindir <map>  (standaard is /var/lib/dpkg)\n"
+#~ "         --help  --versien  --licence  --expert  --debug <bestand> | -"
+#~ "D<bestand>\n"
+#~ "Acties:  access update select install config remove quit menu\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.  Dit is vrije programmatuur; zie\n"
+#~ "de GNU General Public License versie 2 of later voor kopieervoorwaarden.\n"
+#~ "Er is GEEN garantie.  Zie dpkg-split --licence voor details.\n"
+
 #~ msgid "Type md5sum --help for help."
 #~ msgstr "Type md5sum --help voor hulp."
 

po/nn.po

@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: debconf_nn\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: 2005-06-27 21:34+0200\n"
 "Last-Translator: Håvard Korsvoll <korsvoll@skulelinux.no>\n"
 "Language-Team: Norwegian nynorsk <i18n-nn@lister.ping.uio.no>\n"
@@ -2125,90 +2125,89 @@ msgid "failed to exec rm for cleanup"
 msgstr "klarte ikkje køyra «rm» for opprydding"
 
 #: 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 "» pakkehandteringsprogram, versjon "
 
-#: 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 fri programvare, sjå «GNU General Public License» versjon 2 eller\n"
-"nyare for kopieringsvilkår. Det finst INGEN garanti.\n"
-"Sjå "
-
-#: src/main.c:50 src/query.c:465
-msgid " --licence for copyright and license details.\n"
-msgstr " --licence for informasjon om opphavsrett og lisens.\n"
+"Dette er fri programvare. Du finn kopieringsvilkåra i\n"
+"GNU General Public Licence versjon 2 eller nyare. Det finst INGEN garanti.\n"
+"Sjå «dpkg-deb --licence» for detaljar.\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 ""
@@ -2291,14 +2290,15 @@ msgstr ""
 "Bruk «dselect» eller «aptitude» for ei litt meir brukarvennleg "
 "pakkehandtering.\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 "
@@ -2318,17 +2318,17 @@ msgstr ""
 "Val markert med [*] gjev mykje tekst - bruk «less» eller «more» for å lesa "
 "informasjonen."
 
-#: 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 "handlingar i konflikt --%s og --%s"
 
-#: src/main.c:189
+#: src/main.c:191
 #, c-format
 msgid "Warning: obsolete option `--%s'\n"
 msgstr "Åtvaring: Forelda val «%s»\n"
 
-#: src/main.c:197
+#: src/main.c:199
 #, c-format
 msgid ""
 "%s debugging option, --debug=<octal> or -D<octal>:\n"
@@ -2367,27 +2367,27 @@ msgstr ""
 "Avlusingsvala kan kombinerast med logisk eller.\n"
 "Legg merke til at tydingane og verdiane kan verta endra.\n"
 
-#: src/main.c:216
+#: src/main.c:218
 msgid "--debug requires an octal argument"
 msgstr "-- debug krev ein oktal parameter"
 
-#: src/main.c:240
+#: src/main.c:242
 #, c-format
 msgid "null package name in --ignore-depends comma-separated list `%.250s'"
 msgstr "tomt pakkenamn i den kommadelte lista til --ignore-depends «%.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 krev eit gyldig pakkenamn. «%.250s» er ikkje gyldig; %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 "ugyldig heiltal for --%s: «%.250s»"
 
-#: src/main.c:292
+#: src/main.c:294
 #, c-format
 msgid ""
 "%s forcing options - control behaviour when problems found:\n"
@@ -2466,48 +2466,48 @@ msgstr ""
 "alvorleg.\n"
 "Vala som er merkte med [*] er slått på som standard.\n"
 
-#: src/main.c:337
+#: src/main.c:339
 #, c-format
 msgid "unknown force/refuse option `%.*s'"
 msgstr "ukjend tvingings-/avvisingsval «%.*s»"
 
-#: src/main.c:442 src/main.c:446
+#: src/main.c:444 src/main.c:448
 msgid "couldn't malloc in execbackend"
 msgstr "klarte ikkje utføra «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 "klarte ikkje utføra «strdup» i execbackend"
 
-#: src/main.c:455
+#: src/main.c:457
 #, c-format
 msgid "failed to exec %s"
 msgstr "klarte ikkje køyra %s"
 
-#: src/main.c:467
+#: src/main.c:469
 msgid "--command-fd takes 1 argument, not 0"
 msgstr "--command-fd tek éin parameter, ikkje null"
 
-#: src/main.c:468
+#: src/main.c:470
 msgid "--command-fd only takes 1 argument"
 msgstr "--command-fd tek berre ein parameter"
 
-#: src/main.c:470
+#: src/main.c:472
 msgid "invalid number for --command-fd"
 msgstr "ugyldig tal for --command-fd"
 
-#: src/main.c:472
+#: src/main.c:474
 #, c-format
 msgid "couldn't open `%i' for stream"
 msgstr "klarte ikkje opna «%i» for straum"
 
-#: src/main.c:497
+#: src/main.c:499
 #, c-format
 msgid "unexpected eof before end of line %d"
 msgstr "uventa slutt på fil før slutten av 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 "treng eit handlingsval"
 
@@ -2894,46 +2894,31 @@ msgstr ""
 "Bruk dpkg --info (= dpkg-deb --info) for å undersøkja arkivfiler,\n"
 "og dpkg --contents (= dpkg-deb --contents) for å visa innhaldet i dei.\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 "» pakkehandteringsprogram\n"
 
-#: src/query.c:473
-#, c-format
-msgid "Usage: "
-msgstr "Bruk: "
-
-#: 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 ""
 " [<alternativ>] <kommando>\n"
 "Kommandoar:\n"
@@ -2961,10 +2946,25 @@ msgstr ""
 "  ${var[;breidd]}. Felta vil vera høgrejusterte, med mindre breidda er \n"
 "negativ. I så fall vil dei vera venstrejusterte.\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 ""
 "Bruk --help for hjelp om pakkespørjing.\n"
@@ -3994,105 +3994,99 @@ msgid "menu"
 msgstr "meny"
 
 #: 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', brukargrensesnitt for pakkehandtering."
 
 #: 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 ""
-"Versjon %s.\n"
-"Opphavsrett (C) 1994-1996 Ian Jackson.\n"
-"Opphavsrett (C) 2000,20001 Wichert Akkerman.\n"
-"Dette er fri programvare, sjå GNU General Public Licence versjon 2\n"
-"eller seinare for kopieringsvilkår. Det er INGEN garanti. Sjå\n"
-"dselect --licence for detaljar.\n"
-
-#: dselect/main.cc:169
+msgstr ""
+
+#: 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 ""
-"Bruk: dselect [val]\n"
-"      dselect [val] handling ...\n"
-"Val:  --admindir <katalog>  (standard er /var/lib/dpkg)\n"
-"      --help  --version  --licence  --expert  --debug <fil> | -D<fil>\n"
-"      --colour skjermdel:[foreground],[background][:attr[+attr+..]]\n"
-"Handlingar:  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 "Skjermdelar:\n"
 
-#: dselect/main.cc:182
+#: dselect/main.cc:192
 #, c-format
 msgid "Colours:\n"
 msgstr "Fargar:\n"
 
-#: dselect/main.cc:187
+#: dselect/main.cc:197
 #, c-format
 msgid "Attributes:\n"
 msgstr "Attributtar:\n"
 
-#: dselect/main.cc:207
+#: dselect/main.cc:217
 #, c-format
 msgid "couldn't open debug file `%.255s'\n"
 msgstr "klarte ikkje opna avlusingsfil `%.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 "skjermdel"
 
-#: dselect/main.cc:245
+#: dselect/main.cc:255
 msgid "Null colour specification\n"
 msgstr "Ingen fargespesifikasjon\n"
 
-#: dselect/main.cc:253 dselect/main.cc:258
+#: dselect/main.cc:263 dselect/main.cc:268
 msgid "colour"
 msgstr "farge"
 
-#: dselect/main.cc:266
+#: dselect/main.cc:276
 msgid "colour attribute"
 msgstr "fargeattributt"
 
-#: dselect/main.cc:300
+#: dselect/main.cc:310
 msgid "Terminal does not appear to support cursor addressing.\n"
 msgstr "Terminalen ser ikkje ut til å støtta markøradressering.\n"
 
-#: dselect/main.cc:302
+#: dselect/main.cc:312
 msgid "Terminal does not appear to support highlighting.\n"
 msgstr "Terminalen ser ikkje ut til å støtta utheving.\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 ""
 "Set TERM-variabelen rett, bruk ein betre terminal eller \n"
 "du lyt klare deg med handteringsverktøyet for kvar pakke "
 
-#: dselect/main.cc:306
+#: dselect/main.cc:317
 msgid "terminal lacks necessary features, giving up"
 msgstr "terminalen manglar nødvendige funksjonar, gjev opp"
 
-#: dselect/main.cc:384
+#: dselect/main.cc:395
 msgid ""
 "\n"
 "\n"
@@ -4107,7 +4101,7 @@ msgstr ""
 "Trykk <enter> for å stadfesta utvalet.   ^L teiknar skjermen på ny.\n"
 "\n"
 
-#: dselect/main.cc:398
+#: dselect/main.cc:410
 msgid ""
 "\n"
 "\n"
@@ -4117,11 +4111,11 @@ msgstr ""
 "\n"
 "Skriveverna tilgang: berre førehandsvising av utval er tilgjengeleg!"
 
-#: dselect/main.cc:417
+#: dselect/main.cc:429
 msgid "failed to getch in main menu"
 msgstr "klarte ikkje bruka «getch» i hovedmenyen"
 
-#: dselect/main.cc:490
+#: dselect/main.cc:502
 #, c-format
 msgid "unknown action string `%.50s'"
 msgstr "ukjent handlingsstreng `%.50s'"
@@ -5346,62 +5340,44 @@ msgstr "Feil i format"
 msgid "--contents takes exactly one argument"
 msgstr "--contents tek akkurat éin 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 "' versjon for pakkearkivmotoren "
 
-#: 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 fri programvare. Du finn kopieringsvilkåra i\n"
-"GNU General Public Licence versjon 2 eller nyare. Det finst INGEN garanti.\n"
-"Sjå «dpkg-deb --licence» for detaljar.\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 <katalog> [<deb>]      Bygg eit arkiv.\n"
@@ -5442,7 +5418,16 @@ msgstr ""
 "«dselect» eller «aptitude» for brukarvennleg pakkehandtering. Pakkar som er\n"
 "pakka ut med «dpkg-deb --extract» vil ikkje verta rett installerte.\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."
@@ -5450,7 +5435,7 @@ msgstr ""
 "Skriv «dpkg-deb --help» for hjelp med endring av *.deb-filer.\n"
 "Skriv «dpkg --help» for hjelp med å installera og avinstallera pakkar."
 
-#: dpkg-deb/main.c:176
+#: dpkg-deb/main.c:181
 #, c-format
 msgid "unknown compression type `%s'!"
 msgstr "ukjend komprimeringstype «%s»!"
@@ -5616,43 +5601,42 @@ msgstr "--join tek ein eller fleire delfilparametrar"
 msgid "part %d is missing"
 msgstr "delen %d manglar"
 
-#: 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», verktøy for pakkedeling og samansetjing, "
 "versjon "
 
-#: 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 ""
-"Opphavsrett (C) 1994-1996 Ian Jackson. Dette er fri programvare. Sjå\n"
-"GNU General Public Licence versjon 2 eller nyare for kopieringsvilkår.\n"
-"Det er INGEN garanti. Du finn fleire detaljar i «dpkg-split --licence».\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 ""
@@ -5676,30 +5660,30 @@ msgstr ""
 "\n"
 "Avsluttingstatus: 0 = OK;  1 = -a er ikkje ein del;  2 = problem!\n"
 
-#: dpkg-split/main.c:69
+#: dpkg-split/main.c:75
 msgid "Type dpkg-split --help for help."
 msgstr "Skriv «dpkg-split --help» for hjelp."
 
-#: dpkg-split/main.c:79
+#: dpkg-split/main.c:85
 #, c-format
 msgid "error reading %s"
 msgstr "feil ved lesing av %s"
 
-#: dpkg-split/main.c:83
+#: dpkg-split/main.c:89
 #, c-format
 msgid "error reading %.250s"
 msgstr "feil ved lesing av %.250s"
 
-#: dpkg-split/main.c:84
+#: dpkg-split/main.c:90
 #, c-format
 msgid "unexpected end of file in %.250s"
 msgstr "uventa slutt på fil 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 altfor stor eller storleiken er ikkje 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 må minst vera på %dk (for at hovudet skal få plass)"
@@ -5834,3 +5818,65 @@ msgstr "kjeldefila «%.250s» er inga vanleg fil"
 #: dpkg-split/split.c:70
 msgid "unable to exec mksplit"
 msgstr "klarte ikkje køyra «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 fri programvare, sjå «GNU General Public License» versjon 2 "
+#~ "eller\n"
+#~ "nyare for kopieringsvilkår. Det finst INGEN garanti.\n"
+#~ "Sjå "
+
+#~ msgid " --licence for copyright and license details.\n"
+#~ msgstr " --licence for informasjon om opphavsrett og lisens.\n"
+
+#~ msgid "Debian `"
+#~ msgstr "Debian «"
+
+#~ msgid "Usage: "
+#~ msgstr "Bruk: "
+
+#~ 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 ""
+#~ "Versjon %s.\n"
+#~ "Opphavsrett (C) 1994-1996 Ian Jackson.\n"
+#~ "Opphavsrett (C) 2000,20001 Wichert Akkerman.\n"
+#~ "Dette er fri programvare, sjå GNU General Public Licence versjon 2\n"
+#~ "eller seinare for kopieringsvilkår. Det er INGEN garanti. Sjå\n"
+#~ "dselect --licence for detaljar.\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 ""
+#~ "Bruk: dselect [val]\n"
+#~ "      dselect [val] handling ...\n"
+#~ "Val:  --admindir <katalog>  (standard er /var/lib/dpkg)\n"
+#~ "      --help  --version  --licence  --expert  --debug <fil> | -D<fil>\n"
+#~ "      --colour skjermdel:[foreground],[background][:attr[+attr+..]]\n"
+#~ "Handlingar:  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 ""
+#~ "Opphavsrett (C) 1994-1996 Ian Jackson. Dette er fri programvare. Sjå\n"
+#~ "GNU General Public Licence versjon 2 eller nyare for kopieringsvilkår.\n"
+#~ "Det er INGEN garanti. Du finn fleire detaljar i «dpkg-split --licence».\n"

po/pl.po

@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dpkg 1.13\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: 2005-08-23 10:11+0200\n"
 "Last-Translator: Bartosz Fenski <fenio@debian.org>\n"
 "Language-Team: Polish <pddp@debian.linux.org.pl>\n"
@@ -2136,91 +2136,91 @@ msgid "failed to exec rm for cleanup"
 msgstr "nie mo¿na wywo³aæ `rm' aby wyczy¶ciæ katalog"
 
 #: 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 "' program do zarz±dzania pakietami, wersja "
 
-#: 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 ""
 "Niniejszy program jest oprogramowaniem wolnym, sprawd¼ \n"
 "Powszechn± Licencjê Publiczn± GNU w wersji drugiej lub pó¼niejszej,\n"
-"by dowiedzieæ siê o warunkach dystrybucji. Brak JAKIEJKOLWIEK gwarancji.\n"
-"Sprawd¼ "
-
-#: src/main.c:50 src/query.c:465
-msgid " --licence for copyright and license details.\n"
-msgstr " --licence informacje o prawach autorskich i licencji.\n"
+"by dowiedzieæ siê o warunkach rozpowszechniania.\n"
+"Brak JAKIEJKOLWIEK gwarancji.\n"
+"Wiêcej szczegó³ów w dpkg-deb --license.\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 ""
@@ -2296,14 +2296,15 @@ msgstr ""
 "U¿yj `dselect' lub 'aptitude je¶li potrzebujesz wygodnego programu \n"
 "do zarz±dzania pakietami.\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 "
@@ -2320,17 +2321,17 @@ msgstr ""
 "\n"
 "Opcje oznaczone [*] podaj± du¿o tre¶ci - skieruj potok na `less' lub `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 "konflikt miêdzy dzia³aniem --%s i --%s"
 
-#: src/main.c:189
+#: src/main.c:191
 #, c-format
 msgid "Warning: obsolete option `--%s'\n"
 msgstr "Uwaga: niewykorzystywana ju¿ opcja `--%s'\n"
 
-#: src/main.c:197
+#: src/main.c:199
 #, c-format
 msgid ""
 "%s debugging option, --debug=<octal> or -D<octal>:\n"
@@ -2368,28 +2369,28 @@ msgstr ""
 "Opcje debuggera mog± byæ ³±czone poprzez zsumowanie poszczególnych "
 "warto¶ci.\n"
 
-#: src/main.c:216
+#: src/main.c:218
 msgid "--debug requires an octal argument"
 msgstr "--debug wymaga podania argumentu bêd±cego liczb± ósemkow±"
 
-#: src/main.c:240
+#: src/main.c:242
 #, c-format
 msgid "null package name in --ignore-depends comma-separated list `%.250s'"
 msgstr "pusta nazwa pakietu dla --ignore-depends w li¶cie `%.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 wymaga podania poprawnej nazwy pakietu. `%.250s' jest "
 "niepoprawny; %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 "b³êdna warto¶æ liczbowa dla --%s: `%.250s'"
 
-#: src/main.c:292
+#: src/main.c:294
 #, c-format
 msgid ""
 "%s forcing options - control behaviour when problems found:\n"
@@ -2466,48 +2467,48 @@ msgstr ""
 "UWAGA - u¿ycie opcji oznaczonej [!] mo¿e powa¿nie uszkodziæ instalacjê.\n"
 "Opcje oznaczone [*] s± domy¶lnie w³±czone.\n"
 
-#: src/main.c:337
+#: src/main.c:339
 #, c-format
 msgid "unknown force/refuse option `%.*s'"
 msgstr "nieznana opcja force/refuse `%.*s'"
 
-#: src/main.c:442 src/main.c:446
+#: src/main.c:444 src/main.c:448
 msgid "couldn't malloc in execbackend"
 msgstr "malloc w execbackend nie powiod³o siê"
 
-#: src/main.c:444 src/main.c:451
+#: src/main.c:446 src/main.c:453
 msgid "couldn't strdup in execbackend"
 msgstr "strdup w execbackend nie powiod³o siê"
 
-#: src/main.c:455
+#: src/main.c:457
 #, c-format
 msgid "failed to exec %s"
 msgstr "wywo³anie %s nie powiod³o siê"
 
-#: src/main.c:467
+#: src/main.c:469
 msgid "--command-fd takes 1 argument, not 0"
 msgstr "--command-fd wymaga 1 argumentu, nie 0"
 
-#: src/main.c:468
+#: src/main.c:470
 msgid "--command-fd only takes 1 argument"
 msgstr "--command-fd wymaga tylko 1 argumentu"
 
-#: src/main.c:470
+#: src/main.c:472
 msgid "invalid number for --command-fd"
 msgstr "nieprawid³owy numer przy --command-fd"
 
-#: src/main.c:472
+#: src/main.c:474
 #, c-format
 msgid "couldn't open `%i' for stream"
 msgstr "nie uda³o siê otworzyæ `%i' jako strumienia"
 
-#: src/main.c:497
+#: src/main.c:499
 #, c-format
 msgid "unexpected eof before end of line %d"
 msgstr "niespodziewany EOF przed koñcem linii %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 "nale¿y okre¶liæ dzia³anie"
 
@@ -2902,46 +2903,31 @@ msgstr ""
 "U¿yj dpkg --info (= dpkg-deb --info) aby zobaczyæ informacje o pakiecie,\n"
 "oraz dpkg --contents (= dpkg-deb --contents) aby sprawdziæ jego zawarto¶æ.\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 "' narzêdzie do przeszukiwania pakietów\n"
 
-#: src/query.c:473
-#, c-format
-msgid "Usage: "
-msgstr "U¿ywanie: "
-
-#: 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 ""
 " [<opcje>] <polecenie>\n"
 "Polecenia:\n"
@@ -2967,10 +2953,25 @@ msgstr ""
 "  strony, chyba ¿e zmienna szeroko¶æ jest ujemna, co spowoduje \n"
 "  przesuniêcie do strony lewej.\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 ""
 "U¿yj --help by uzyskaæ pomoc o wyszukiwanych pakietach;\n"
@@ -4017,106 +4018,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', nak³adka na program zarz±dzania pakietami."
 
 #: 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 ""
-"Wersja %s.\n"
-"Copyright (C) 1994-1996 Ian Jackson.\n"
-"Copyright (C) 2000,2001 Wichert Akkerman.\n"
-"Niniejszy program jest oprogramowaniem wolnym, sprawd¼ \n"
-"Powszechn± Licencjê Publiczn± GNU w wersji drugiej lub pó¼niejszej,\n"
-"by dowiedzieæ siê o warunkach rozpowszechniania.\n"
-"Brak JAKIEJKOLWIEK gwarancji.\n"
-"Wiêcej szczegó³ów w dselect --license.\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"
+"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 ""
-"U¿ycie: dselect [opcje]\n"
-"        dselect [opcje] dzia³anie ...\n"
-"Opcje:    --admindir <katalog>  (domy¶lnie /var/lib/dpkg)\n"
-"          --help  --version  --licence  --expert  --debug <plik> | -D<plik>\n"
-"Dzia³ania:  access update select install config remove quit\n"
 
-#: dselect/main.cc:177
+#: dselect/main.cc:187
 #, c-format
 msgid "Screenparts:\n"
 msgstr "Czê¶ci widoku:\n"
 
-#: dselect/main.cc:182
+#: dselect/main.cc:192
 #, c-format
 msgid "Colours:\n"
 msgstr "Kolory:\n"
 
-#: dselect/main.cc:187
+#: dselect/main.cc:197
 #, c-format
 msgid "Attributes:\n"
 msgstr "Atrybuty:\n"
 
-#: dselect/main.cc:207
+#: dselect/main.cc:217
 #, c-format
 msgid "couldn't open debug file `%.255s'\n"
 msgstr "nie mo¿na otworzyæ pliku debuggera `%.255s'\n"
 
-#: dselect/main.cc:222
+#: dselect/main.cc:232
 #, c-format
 msgid "Invalid %s `%s'\n"
 msgstr "Nieprawid³owy %s `%s'\n"
 
-#: dselect/main.cc:239
+#: dselect/main.cc:249
 msgid "screen part"
 msgstr "czê¶æ widoku"
 
-#: dselect/main.cc:245
+#: dselect/main.cc:255
 msgid "Null colour specification\n"
 msgstr "specyfikacja pustego koloru\n"
 
-#: dselect/main.cc:253 dselect/main.cc:258
+#: dselect/main.cc:263 dselect/main.cc:268
 msgid "colour"
 msgstr "kolor"
 
-#: dselect/main.cc:266
+#: dselect/main.cc:276
 msgid "colour attribute"
 msgstr "atrybuty koloru"
 
-#: dselect/main.cc:300
+#: dselect/main.cc:310
 msgid "Terminal does not appear to support cursor addressing.\n"
 msgstr "Terminal nie obs³uguje adresowania kursora.\n"
 
-#: dselect/main.cc:302
+#: dselect/main.cc:312
 msgid "Terminal does not appear to support highlighting.\n"
 msgstr "Terminal nie obs³uguje pod¶wietlania.\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 ""
 "Proszê poprawnie ustawiæ zmienn± TERM, u¿yæ lepszego terminala,\n"
 "lub wykorzystaæ narzêdzie do zarz±dzania pakietami z linii poleceñ "
 
-#: dselect/main.cc:306
+#: dselect/main.cc:317
 msgid "terminal lacks necessary features, giving up"
 msgstr "brak potrzebnych funkcji dla terminala"
 
-#: dselect/main.cc:384
+#: dselect/main.cc:395
 msgid ""
 "\n"
 "\n"
@@ -4130,7 +4124,7 @@ msgstr ""
 "Wci¶nij ENTER dla potwiedzenie wyboru.   ^L przerysowanie ekranu.\n"
 "\n"
 
-#: dselect/main.cc:398
+#: dselect/main.cc:410
 msgid ""
 "\n"
 "\n"
@@ -4140,11 +4134,11 @@ msgstr ""
 "\n"
 "Tryb tylko do odczytu: mo¿na jedynie przegl±daæ listê pakietów!"
 
-#: dselect/main.cc:417
+#: dselect/main.cc:429
 msgid "failed to getch in main menu"
 msgstr "nie mo¿na wywo³aæ `getch' w g³ównym menu"
 
-#: dselect/main.cc:490
+#: dselect/main.cc:502
 #, c-format
 msgid "unknown action string `%.50s'"
 msgstr "nieznane dzia³anie `%.50s'"
@@ -5375,64 +5369,44 @@ msgstr "B
 msgid "--contents takes exactly one argument"
 msgstr "--contents wymaga podania dok³adnie jednego argumentu"
 
-#: 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 "' program do zarz±dzania pakietami, wersja "
 
-#: 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 ""
-"Niniejszy program jest oprogramowaniem wolnym, sprawd¼ \n"
-"Powszechn± Licencjê Publiczn± GNU w wersji drugiej lub pó¼niejszej,\n"
-"by dowiedzieæ siê o warunkach rozpowszechniania.\n"
-"Brak JAKIEJKOLWIEK gwarancji.\n"
-"Wiêcej szczegó³ów w dpkg-deb --license.\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 ""
 "Polecenie:\n"
 "  -b|--build <katalog> [<deb>]       budowanie archiwum.\n"
@@ -5476,7 +5450,16 @@ msgstr ""
 "`dpkg-deb --extract' nie bêd± poprawnie\n"
 " zainstalowane !\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."
@@ -5484,7 +5467,7 @@ msgstr ""
 "Wpisz dpkg-deb --help aby dowiedzieæ siê jak operowaæ plikami *.deb;\n"
 "Wpisz dpkg --help aby dowiedzieæ siê jak (od)instalowaæ pakiety."
 
-#: dpkg-deb/main.c:176
+#: dpkg-deb/main.c:181
 #, c-format
 msgid "unknown compression type `%s'!"
 msgstr "nieznany typ kompresji `%s'!"
@@ -5653,46 +5636,42 @@ msgstr ""
 msgid "part %d is missing"
 msgstr "brakuje czê¶ci %d"
 
-#: 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', program do dzielenia/³±czenia pakietów, "
 "wersja "
 
-#: 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 1994-1996 Ian Jackson.\n"
-"Niniejszy program jest oprogramowaniem wolnodostêpnym, rozpowszechnianym\n"
-"na warunkach Powszechnej Licencji Publicznej GNU wersji drugiej tej "
-"licencji\n"
-"lub której¶ z pó¼niejszych wersji. Brak JAKIEJKOLWIEK gwarancji.\n"
-"Wiêcej szczegó³ów zobacz w dpkg-split --licence.\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 ""
@@ -5718,30 +5697,30 @@ msgstr ""
 "\n"
 "Kod powrotu: 0 = OK;  1 = -a nie jest czê¶ci±;  2 = problem!\n"
 
-#: dpkg-split/main.c:69
+#: dpkg-split/main.c:75
 msgid "Type dpkg-split --help for help."
 msgstr "Wpisz dpkg-split --help aby otrzymaæ pomoc."
 
-#: dpkg-split/main.c:79
+#: dpkg-split/main.c:85
 #, c-format
 msgid "error reading %s"
 msgstr "b³±d odczytu %s"
 
-#: dpkg-split/main.c:83
+#: dpkg-split/main.c:89
 #, c-format
 msgid "error reading %.250s"
 msgstr "b³±d odczytu %.250s"
 
-#: dpkg-split/main.c:84
+#: dpkg-split/main.c:90
 #, c-format
 msgid "unexpected end of file in %.250s"
 msgstr "niespodziewany koniec pliku dla %.250s"
 
-#: dpkg-split/main.c:104
+#: dpkg-split/main.c:110
 msgid "part size is far too large or is not positive"
 msgstr "rozmiar czê¶ci jest za du¿y lub jest liczb± ujemn±"
 
-#: 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 "rozmiar czê¶ci musi mieæ co najmniej %dk"
@@ -5878,6 +5857,73 @@ msgstr "plik
 msgid "unable to exec mksplit"
 msgstr "nie mo¿na wykonaæ 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 ""
+#~ "Niniejszy program jest oprogramowaniem wolnym, sprawd¼ \n"
+#~ "Powszechn± Licencjê Publiczn± GNU w wersji drugiej lub pó¼niejszej,\n"
+#~ "by dowiedzieæ siê o warunkach dystrybucji. Brak JAKIEJKOLWIEK gwarancji.\n"
+#~ "Sprawd¼ "
+
+#~ msgid " --licence for copyright and license details.\n"
+#~ msgstr " --licence informacje o prawach autorskich i licencji.\n"
+
+#~ msgid "Debian `"
+#~ msgstr "Debian `"
+
+#~ msgid "Usage: "
+#~ msgstr "U¿ywanie: "
+
+#~ 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 ""
+#~ "Wersja %s.\n"
+#~ "Copyright (C) 1994-1996 Ian Jackson.\n"
+#~ "Copyright (C) 2000,2001 Wichert Akkerman.\n"
+#~ "Niniejszy program jest oprogramowaniem wolnym, sprawd¼ \n"
+#~ "Powszechn± Licencjê Publiczn± GNU w wersji drugiej lub pó¼niejszej,\n"
+#~ "by dowiedzieæ siê o warunkach rozpowszechniania.\n"
+#~ "Brak JAKIEJKOLWIEK gwarancji.\n"
+#~ "Wiêcej szczegó³ów w dselect --license.\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 ""
+#~ "U¿ycie: dselect [opcje]\n"
+#~ "        dselect [opcje] dzia³anie ...\n"
+#~ "Opcje:    --admindir <katalog>  (domy¶lnie /var/lib/dpkg)\n"
+#~ "          --help  --version  --licence  --expert  --debug <plik> | -"
+#~ "D<plik>\n"
+#~ "Dzia³ania:  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 1994-1996 Ian Jackson.\n"
+#~ "Niniejszy program jest oprogramowaniem wolnodostêpnym, rozpowszechnianym\n"
+#~ "na warunkach Powszechnej Licencji Publicznej GNU wersji drugiej tej "
+#~ "licencji\n"
+#~ "lub której¶ z pó¼niejszych wersji. Brak JAKIEJKOLWIEK gwarancji.\n"
+#~ "Wiêcej szczegó³ów zobacz w dpkg-split --licence.\n"
+
 #~ msgid "Type md5sum --help for help."
 #~ msgstr "Wpisz md5sum --help aby otrzymaæ pomoc."
 

po/pt.po

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dpkg 1.14\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: 2005-09-25 09:35+0000\n"
 "Last-Translator: Miguel Figueiredo <elmig@debianpt.org>\n"
 "Language-Team: Portuguese <traduz@debianpt.org>\n"
@@ -2146,91 +2146,89 @@ msgid "failed to exec rm for cleanup"
 msgstr "falhou executar rm para limpeza"
 
 #: 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 "' versão de programa de gestão de pacotes "
 
-#: 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 ""
-"Isto é software livre; veja a licença GNU General Public Licence versão 2 "
-"ou\n"
-"superior para condições de cópia.  NÃO existe garantia.\n"
-"Veja "
-
-#: src/main.c:50 src/query.c:465
-msgid " --licence for copyright and license details.\n"
-msgstr " --licence para detalhes de copyright e licença.\n"
+"Isto é software livre; veja a Licença GNU General Public Licence versão 2 \n"
+"ou posterior para condições de cópia. Não existe NENHUMA garantia.\n"
+"Veja os detalhes em dpkg-deb --licence.\n"
 
-#: src/main.c:58
+#: 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 ""
@@ -2321,7 +2319,7 @@ msgstr ""
 "\n"
 "Utilize `dselect' ou 'aptitude' para uma gestão de pacotes user-friendly.\n"
 
-#: src/main.c:119
+#: src/main.c:121
 #, fuzzy
 msgid ""
 "Type dpkg --help for help about installing and deinstalling packages [*];\n"
@@ -2329,7 +2327,7 @@ msgid ""
 "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 "
@@ -2347,17 +2345,17 @@ msgstr ""
 "Opções marcadas com [*] produzem muita saída de texto - utilize pipes com "
 "`less' ou `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 "acções em conflito --%s e --%s"
 
-#: src/main.c:189
+#: src/main.c:191
 #, c-format
 msgid "Warning: obsolete option `--%s'\n"
 msgstr "aviso: opção obsoleta `--%s'\n"
 
-#: src/main.c:197
+#: src/main.c:199
 #, c-format
 msgid ""
 "%s debugging option, --debug=<octal> or -D<octal>:\n"
@@ -2395,29 +2393,29 @@ msgstr ""
 "Opções de debug são misturadas utilizando o bitwise-or.\n"
 "Note que os significados e valores estão sujeitos a mudar.\n"
 
-#: src/main.c:216
+#: src/main.c:218
 msgid "--debug requires an octal argument"
 msgstr "--debug requer um argumento em octal"
 
-#: src/main.c:240
+#: src/main.c:242
 #, c-format
 msgid "null package name in --ignore-depends comma-separated list `%.250s'"
 msgstr ""
 "nome de pacote nulo na lista separada por virgulas de --ignore-depends`"
 "%.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 requer um nome de pacote válido.  `%.250s' não o é; %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 "número inteiro inválido para --%s: `%.250s'"
 
-#: src/main.c:292
+#: src/main.c:294
 #, c-format
 msgid ""
 "%s forcing options - control behaviour when problems found:\n"
@@ -2506,48 +2504,48 @@ msgstr ""
 "instalação.\n"
 "Opções para forçar marcadas com [*] são habilitadas por padrão.\n"
 
-#: src/main.c:337
+#: src/main.c:339
 #, c-format
 msgid "unknown force/refuse option `%.*s'"
 msgstr "opção desconhecida de forçar/recusar `%.*s'"
 
-#: src/main.c:442 src/main.c:446
+#: src/main.c:444 src/main.c:448
 msgid "couldn't malloc in execbackend"
 msgstr "não pode fazer malloc no execbackend"
 
-#: src/main.c:444 src/main.c:451
+#: src/main.c:446 src/main.c:453
 msgid "couldn't strdup in execbackend"
 msgstr "não pode fazer strdup no execbackend"
 
-#: src/main.c:455
+#: src/main.c:457
 #, c-format
 msgid "failed to exec %s"
 msgstr "falhou executar %s"
 
-#: src/main.c:467
+#: src/main.c:469
 msgid "--command-fd takes 1 argument, not 0"
 msgstr "--command-fd leva 1 argumento, não 0"
 
-#: src/main.c:468
+#: src/main.c:470
 msgid "--command-fd only takes 1 argument"
 msgstr "--command-df leva apenas 1 argumento"
 
-#: src/main.c:470
+#: src/main.c:472
 msgid "invalid number for --command-fd"
 msgstr "número inválido para --command-fd"
 
-#: src/main.c:472
+#: src/main.c:474
 #, c-format
 msgid "couldn't open `%i' for stream"
 msgstr "não pode abrir `%i' para stream"
 
-#: src/main.c:497
+#: src/main.c:499
 #, c-format
 msgid "unexpected eof before end of line %d"
 msgstr "eof inesperado antes do fim da linha %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 "é necessária uma opção de acção"
 
@@ -2943,46 +2941,31 @@ msgstr ""
 "Utilize dpkg --info (= dpkg-deb --info) para examinar ficheiros de arquivo,\n"
 "e dpkg --contents (= dpkg-deb --contents) para listar o seu conteúdo.\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 "' ferramenta de query do programa de gestão de pacotes\n"
 
-#: src/query.c:473
-#, c-format
-msgid "Usage: "
-msgstr "Utilização: "
-
-#: src/query.c:474
+#: 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 ""
 " [<opção>] <comando>\n"
 "Commands:\n"
@@ -3014,10 +2997,25 @@ msgstr ""
 "  a largura seja negativa, neste caso o alinhamento à esquerda será "
 "utilizado.\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 ""
 "Utilize --help para ajuda acerca da pesquisa de pacotes;\n"
@@ -4080,106 +4078,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 "Interface de gestão de pacotes do Debian `%s'."
 
 #: 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 ""
-"Versão %s.\n"
-"Copyright (C) 1994-1996 Ian Jackson.\n"
-"Copyright (C) 2000,2001 Wichert Akkerman.\n"
-"Isto é software livre; veja a licença GNU General Public Licence versão 2\n"
-"ou posterior para condições de cópia.  Não há NENHUMA garantia.  Veja\n"
-"dselect --licence para os detalhes.\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 ""
-"Uso:   dselect [opções]\n"
-"       dselect [opções] acção ...\n"
-"Opções: --admindir <directorio>  (padrão é /var/lib/dpkg)\n"
-"        --help --version --licence --expert --debug <ficheiros> | -"
-"D<ficheiro>\n"
-"        --colour screenpart:[foreground],[background][:attr[+attr+..]]\n"
-"Acções:  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 "Screenparts:\n"
 
-#: dselect/main.cc:182
+#: dselect/main.cc:192
 #, c-format
 msgid "Colours:\n"
 msgstr "Cores:\n"
 
-#: dselect/main.cc:187
+#: dselect/main.cc:197
 #, c-format
 msgid "Attributes:\n"
 msgstr "Atributos:\n"
 
-#: dselect/main.cc:207
+#: dselect/main.cc:217
 #, c-format
 msgid "couldn't open debug file `%.255s'\n"
 msgstr "não pode abrir ficheiro de debug `%.255s'\n"
 
-#: dselect/main.cc:222
+#: dselect/main.cc:232
 #, c-format
 msgid "Invalid %s `%s'\n"
 msgstr "%s inválido `%s'\n"
 
-#: dselect/main.cc:239
+#: dselect/main.cc:249
 msgid "screen part"
 msgstr "screen part"
 
-#: dselect/main.cc:245
+#: dselect/main.cc:255
 msgid "Null colour specification\n"
 msgstr "Especificação de cor nula\n"
 
-#: dselect/main.cc:253 dselect/main.cc:258
+#: dselect/main.cc:263 dselect/main.cc:268
 msgid "colour"
 msgstr "cor"
 
-#: dselect/main.cc:266
+#: dselect/main.cc:276
 msgid "colour attribute"
 msgstr "atributo de cor"
 
-#: dselect/main.cc:300
+#: dselect/main.cc:310
 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:302
+#: dselect/main.cc:312
 msgid "Terminal does not appear to support highlighting.\n"
 msgstr "O terminal não parece suportar highlighting\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 ""
 "Defina a veriável TERM correctamente, utilize um terminal melhor,\n"
 "ou faça com a ferramente de gestão por pacote "
 
-#: dselect/main.cc:306
+#: dselect/main.cc:317
 msgid "terminal lacks necessary features, giving up"
 msgstr "o terminal carece de funcionalidades necessárias, desistindo"
 
-#: dselect/main.cc:384
+#: dselect/main.cc:395
 msgid ""
 "\n"
 "\n"
@@ -4192,7 +4183,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:398
+#: dselect/main.cc:410
 msgid ""
 "\n"
 "\n"
@@ -4202,11 +4193,11 @@ msgstr ""
 "\n"
 "Acesso apenas de leitura: só está disponível a visualização!"
 
-#: dselect/main.cc:417
+#: dselect/main.cc:429
 msgid "failed to getch in main menu"
 msgstr "falhou o getch no menu principal"
 
-#: dselect/main.cc:490
+#: dselect/main.cc:502
 #, c-format
 msgid "unknown action string `%.50s'"
 msgstr "string de acção desconhecida `%.50s'"
@@ -5445,63 +5436,44 @@ msgstr "Erro no formato"
 msgid "--contents takes exactly one argument"
 msgstr "--contents toma exactamente um argumento"
 
-#: 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 "' versão backend do arquivo de pacote "
 
-#: 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 ""
-"Isto é software livre; veja a Licença GNU General Public Licence versão 2 \n"
-"ou posterior para condições de cópia. Não existe NENHUMA garantia.\n"
-"Veja os detalhes em dpkg-deb --licence.\n"
-
-#: dpkg-deb/main.c:58
-#, fuzzy
+#: 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 ""
 "Comando:\n"
 "  -b|--build <directório> [<deb>]   construir um arquivo.\n"
@@ -5542,7 +5514,16 @@ msgstr ""
 "para uma gestão de pacotes user-friendly. Pacotes descompactados\n"
 "com `dpkg-deb --extract' serão incorretamente instalados !\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."
@@ -5550,7 +5531,7 @@ msgstr ""
 "Escreva dpkg-deb --help para ajuda sobre manipulação de ficheiros *.deb;\n"
 "Escreva dpkg --help para ajuda sobre instalar de desinstalar pacotes."
 
-#: dpkg-deb/main.c:176
+#: dpkg-deb/main.c:181
 #, fuzzy, c-format
 msgid "unknown compression type `%s'!"
 msgstr "opção desconhecida --%s"
@@ -5723,42 +5704,41 @@ msgstr "--join necessita de um ou mais partes de ficheiro como argumento"
 msgid "part %d is missing"
 msgstr "falta a parte %d"
 
-#: 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 ""
 "Pacote Debian GNU/Linux `dpkg-split' ferramenta de dividir/juntar; versão "
 
-#: 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.  Isto é software livre; veja a licença\n"
-"GNU General Public Licence versão 2 ou posterior para condições de cópia.\n"
-"NÃO existe garantia.  Veja dpkg-split --licence para detalhes.\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 ""
@@ -5783,30 +5763,30 @@ msgstr ""
 "\n"
 "Estado de saída: 0 = OK; 1 = -a não é uma parte; 2 = problema!\n"
 
-#: dpkg-split/main.c:69
+#: dpkg-split/main.c:75
 msgid "Type dpkg-split --help for help."
 msgstr "Escreva dpkg-split --help para ajuda."
 
-#: dpkg-split/main.c:79
+#: dpkg-split/main.c:85
 #, c-format
 msgid "error reading %s"
 msgstr "erro lendo %s"
 
-#: dpkg-split/main.c:83
+#: dpkg-split/main.c:89
 #, c-format
 msgid "error reading %.250s"
 msgstr "erro lendo %.250s"
 
-#: dpkg-split/main.c:84
+#: dpkg-split/main.c:90
 #, c-format
 msgid "unexpected end of file in %.250s"
 msgstr "fim de ficheiro inesperado em %.250s"
 
-#: dpkg-split/main.c:104
+#: dpkg-split/main.c:110
 msgid "part size is far too large or is not positive"
 msgstr "o tamanho da parte ou é muito grande ou não é positivo"
 
-#: 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 ""
@@ -5942,6 +5922,72 @@ msgstr "o ficheiro fonte `%.250s' não é um ficheiro simples"
 msgid "unable to exec mksplit"
 msgstr "não foi possível executar 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 ""
+#~ "Isto é software livre; veja a licença GNU General Public Licence versão 2 "
+#~ "ou\n"
+#~ "superior para condições de cópia.  NÃO existe garantia.\n"
+#~ "Veja "
+
+#~ msgid " --licence for copyright and license details.\n"
+#~ msgstr " --licence para detalhes de copyright e licença.\n"
+
+#~ msgid "Debian `"
+#~ msgstr "Debian `"
+
+#~ msgid "Usage: "
+#~ msgstr "Utilização: "
+
+#~ 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 ""
+#~ "Versão %s.\n"
+#~ "Copyright (C) 1994-1996 Ian Jackson.\n"
+#~ "Copyright (C) 2000,2001 Wichert Akkerman.\n"
+#~ "Isto é software livre; veja a licença GNU General Public Licence versão "
+#~ "2\n"
+#~ "ou posterior para condições de cópia.  Não há NENHUMA garantia.  Veja\n"
+#~ "dselect --licence para os detalhes.\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 ""
+#~ "Uso:   dselect [opções]\n"
+#~ "       dselect [opções] acção ...\n"
+#~ "Opções: --admindir <directorio>  (padrão é /var/lib/dpkg)\n"
+#~ "        --help --version --licence --expert --debug <ficheiros> | -"
+#~ "D<ficheiro>\n"
+#~ "        --colour screenpart:[foreground],[background][:attr[+attr+..]]\n"
+#~ "Acções:  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.  Isto é software livre; veja a "
+#~ "licença\n"
+#~ "GNU General Public Licence versão 2 ou posterior para condições de "
+#~ "cópia.\n"
+#~ "NÃO existe garantia.  Veja dpkg-split --licence para detalhes.\n"
+
 #~ msgid ""
 #~ "dpkg: unexpected output from `%s --print-libgcc-file-name':\n"
 #~ " `%s'\n"

po/pt_BR.po

@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dpkg 1.13\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: 2005-08-26 18:40-0300\n"
 "Last-Translator: André Luís Lopes <andrelop@debian.org>\n"
 "Language-Team: Debian-BR Project <debian-l10n-portuguese@lists.debian.org>\n"
@@ -2148,90 +2148,89 @@ msgid "failed to exec rm for cleanup"
 msgstr "falha ao executar rm para limpeza"
 
 #: 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 "' programa de gerenciamento de pacotes versão "
 
-#: 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 ""
 "Isso é um software livre; veja a Licença Pública Geral (GPL) versão 2 ou\n"
 "mais atual para condições de cópia.  Não há NENHUMA garantia.\n"
-"Veja "
-
-#: src/main.c:50 src/query.c:465
-msgid " --licence for copyright and license details.\n"
-msgstr " --licence para copyright e detalhes de licenciamento.\n"
+"Veja dpkg-deb --license para direitos autorais e detalhes de licença.\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 ""
@@ -2318,14 +2317,15 @@ msgstr ""
 "\n"
 "Use `dselect' ou 'aptitude' para gerenciamento amigável de pacotes.\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 "
@@ -2344,17 +2344,17 @@ msgstr ""
 "Opções marcadas com [*] produzem muita saída de texto - passe-a por `less' "
 "ou `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 "ações conflitantes --%s e --%s"
 
-#: src/main.c:189
+#: src/main.c:191
 #, c-format
 msgid "Warning: obsolete option `--%s'\n"
 msgstr "Aviso: opção obsoleta `--%s'\n"
 
-#: src/main.c:197
+#: src/main.c:199
 #, c-format
 msgid ""
 "%s debugging option, --debug=<octal> or -D<octal>:\n"
@@ -2392,28 +2392,28 @@ msgstr ""
 "Opções de depuração são misturadas usando o bitwise-or.\n"
 "Note que os significados e valores estão sujeitos à mudanças.\n"
 
-#: src/main.c:216
+#: src/main.c:218
 msgid "--debug requires an octal argument"
 msgstr "--debug requer um argumento octal"
 
-#: src/main.c:240
+#: src/main.c:242
 #, c-format
 msgid "null package name in --ignore-depends comma-separated list `%.250s'"
 msgstr ""
 "nome de pacote nulo na lista separada por vírgulas `%.250s' em --ignore-"
 "depends"
 
-#: 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 requer um nome de pacote válido. `%.250s' não é; %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 "inteiro inválido para --%s: `%.250s'"
 
-#: src/main.c:292
+#: src/main.c:294
 #, c-format
 msgid ""
 "%s forcing options - control behaviour when problems found:\n"
@@ -2500,48 +2500,48 @@ msgstr ""
 "instalação.\n"
 "Opções para forçar marcadas com [*] são habilitadas por padrão.\n"
 
-#: src/main.c:337
+#: src/main.c:339
 #, c-format
 msgid "unknown force/refuse option `%.*s'"
 msgstr "opção de forçar/recusar `%.*s' desconhecida"
 
-#: src/main.c:442 src/main.c:446
+#: src/main.c:444 src/main.c:448
 msgid "couldn't malloc in execbackend"
 msgstr "não foi possível alocar memória em execbackend"
 
-#: src/main.c:444 src/main.c:451
+#: src/main.c:446 src/main.c:453
 msgid "couldn't strdup in execbackend"
 msgstr "não foi possível fazer strdup em execbackend"
 
-#: src/main.c:455
+#: src/main.c:457
 #, c-format
 msgid "failed to exec %s"
 msgstr "falha ao executar %s"
 
-#: src/main.c:467
+#: src/main.c:469
 msgid "--command-fd takes 1 argument, not 0"
 msgstr "--command-fd recebe 1 argumento, não 0"
 
-#: src/main.c:468
+#: src/main.c:470
 msgid "--command-fd only takes 1 argument"
 msgstr "--command-fd recebe somente 1 argumento"
 
-#: src/main.c:470
+#: src/main.c:472
 msgid "invalid number for --command-fd"
 msgstr "número inválido para --command-fd"
 
-#: src/main.c:472
+#: src/main.c:474
 #, c-format
 msgid "couldn't open `%i' for stream"
 msgstr "não foi possível abrir `%i' para stream"
 
-#: src/main.c:497
+#: src/main.c:499
 #, c-format
 msgid "unexpected eof before end of line %d"
 msgstr "eof inesperado após fim da linha %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 "preciso de uma opção de ação"
 
@@ -2943,46 +2943,31 @@ msgstr ""
 "Use dpkg --info (= dpkg-deb --info) para examinar arquivos do pacote,\n"
 "e dpkg --contents (= dpkg-deb --contents) para listar seu conteúdo.\n"
 
-#: src/query.c:459 dpkg-deb/main.c:46
-msgid "Debian `"
-msgstr "Debian GNU/Linux `"
-
-#: 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 "' ferramento de procura do programa de gerenciamento de pacotes\n"
 
-#: src/query.c:473
-#, c-format
-msgid "Usage: "
-msgstr "Uso: "
-
-#: 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 ""
 " [<opção>] <comando>\n"
 "Comandos:\n"
@@ -3012,10 +2997,25 @@ msgstr ""
 "  à direita a menos que a largura seja negativa e neste caso o \n"
 "  alinhamento à esquerda será usado. \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 ""
 "Use --help para ajuda sobre pesquisa de pacotes;\n"
@@ -4077,106 +4077,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 "Frontend de gerenciador de pacotes do Debian GNU/Linux `%s'"
 
 #: 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 ""
-"Versão %s.\n"
-"Copyright (C) 1994-1996 Ian Jackson.\n"
-"Copyright (C) 2000,2001 Wichert Akkerman.\n"
-"Este é um software livre; veja a Licença Pública Geral GNU versão 2\n"
-"ou posterior para condições de cópia. Não há NENHUMA garantia. Veja\n"
-"dselect --licence para detalhes.\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 ""
-"Uso:   dselect [opções]\n"
-"       dselect [opções] ação ...\n"
-"Opções:  --admindir <diretório>  (padrão é /var/lib/dpkg)\n"
-"         --help  --version  --licence  --expert  --debug <arquivo> |\n"
-" -D<arquivo>\n"
-"          --colour screenpart:[foreground],[background][:attr[+attr+..]]\n"
-"Ações:    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 "Screenparts:\n"
 
-#: dselect/main.cc:182
+#: dselect/main.cc:192
 #, c-format
 msgid "Colours:\n"
 msgstr "Cores:\n"
 
-#: dselect/main.cc:187
+#: dselect/main.cc:197
 #, c-format
 msgid "Attributes:\n"
 msgstr "Atributos:\n"
 
-#: dselect/main.cc:207
+#: dselect/main.cc:217
 #, 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:222
+#: dselect/main.cc:232
 #, c-format
 msgid "Invalid %s `%s'\n"
 msgstr "%s inválido `%s'\n"
 
-#: dselect/main.cc:239
+#: dselect/main.cc:249
 msgid "screen part"
 msgstr "screen part"
 
-#: dselect/main.cc:245
+#: dselect/main.cc:255
 msgid "Null colour specification\n"
 msgstr "Especificação de cor nula\n"
 
-#: dselect/main.cc:253 dselect/main.cc:258
+#: dselect/main.cc:263 dselect/main.cc:268
 msgid "colour"
 msgstr "cor"
 
-#: dselect/main.cc:266
+#: dselect/main.cc:276
 msgid "colour attribute"
 msgstr "atributo cor"
 
-#: dselect/main.cc:300
+#: dselect/main.cc:310
 msgid "Terminal does not appear to support cursor addressing.\n"
 msgstr "Terminal não parece suportar endereçamento de cursor.\n"
 
-#: dselect/main.cc:302
+#: dselect/main.cc:312
 msgid "Terminal does not appear to support highlighting.\n"
 msgstr "Terminal não parece suportar highlighting.\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 ""
 "Define sua variável TERM corretamente, use um terminal melhor,\n"
 "ou faça com a ferramento de gerenciamento por-pacote "
 
-#: dselect/main.cc:306
+#: dselect/main.cc:317
 msgid "terminal lacks necessary features, giving up"
 msgstr "faltam recursos necessários no terminal, desistindo"
 
-#: dselect/main.cc:384
+#: dselect/main.cc:395
 msgid ""
 "\n"
 "\n"
@@ -4189,7 +4182,7 @@ msgstr ""
 "Mova-se com ^P e ^N, teclas de cursor, letras iniciais, ou dígitos;\n"
 "Pressione <enter> para confirmar a seleção.   ^L redesenha a tela.\n"
 
-#: dselect/main.cc:398
+#: dselect/main.cc:410
 msgid ""
 "\n"
 "\n"
@@ -4199,11 +4192,11 @@ msgstr ""
 "\n"
 "Acesso apenas-leitura: apenas a previsão das seleções está disponível!"
 
-#: dselect/main.cc:417
+#: dselect/main.cc:429
 msgid "failed to getch in main menu"
 msgstr "falha ao fazer getch no menu principal"
 
-#: dselect/main.cc:490
+#: dselect/main.cc:502
 #, c-format
 msgid "unknown action string `%.50s'"
 msgstr "string de ação desconhecida `%.50s'"
@@ -5438,62 +5431,44 @@ msgstr "Erro no formato"
 msgid "--contents takes exactly one argument"
 msgstr "--contents recebe exatamente um argumento"
 
-#: 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 "' backend arquivo de pacote versão "
 
-#: 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 ""
-"Isso é um software livre; veja a Licença Pública Geral (GPL) versão 2 ou\n"
-"mais atual para condições de cópia.  Não há NENHUMA garantia.\n"
-"Veja dpkg-deb --license para direitos autorais e detalhes de licença.\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"
-"\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"
+"  -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"
-"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 ""
 "Comando:\n"
 "  -b|--build <diretório> [<deb>]    constrói um arquivo.\n"
@@ -5538,7 +5513,16 @@ msgstr ""
 "desempacotados usando `dpkg-deb --extract' serão instalados "
 "incorretamente !\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."
@@ -5546,7 +5530,7 @@ msgstr ""
 "Digite dpkg-deb --help para ajuda sobre manipulação de arquivos *.deb;\n"
 "Digite dpkg --help para ajuda sobre instalação e desinstalação de pacotes."
 
-#: dpkg-deb/main.c:176
+#: dpkg-deb/main.c:181
 #, c-format
 msgid "unknown compression type `%s'!"
 msgstr "tipo de compressão desconhecido `%s' !"
@@ -5717,42 +5701,41 @@ msgstr "--join requer um ou mais argumentos arquivo part"
 msgid "part %d is missing"
 msgstr "part %d está faltando"
 
-#: 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 ""
 "Ferramento de split/join de pacote Debian GNU/Linux `dpkg-split'; versão "
 
-#: 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. Isso é software livre; veja a \n"
-"Licença Pública Geral GNU versão 2 ou superior para condições de cópia.\n"
-"NÃO existe garantia. Veja dpkg-split --licence para detalhes.\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 ""
@@ -5776,30 +5759,30 @@ msgstr ""
 "\n"
 "Estado de saída: 0 = OK; 1 = -a não é uma part; 2 = problema!\n"
 
-#: dpkg-split/main.c:69
+#: dpkg-split/main.c:75
 msgid "Type dpkg-split --help for help."
 msgstr "Digite dpkg-split --help para ajuda."
 
-#: dpkg-split/main.c:79
+#: dpkg-split/main.c:85
 #, c-format
 msgid "error reading %s"
 msgstr "erro lendo %s"
 
-#: dpkg-split/main.c:83
+#: dpkg-split/main.c:89
 #, c-format
 msgid "error reading %.250s"
 msgstr "erro lendo %.250s"
 
-#: dpkg-split/main.c:84
+#: dpkg-split/main.c:90
 #, c-format
 msgid "unexpected end of file in %.250s"
 msgstr "fim de arquivo não esperado em %.250s"
 
-#: dpkg-split/main.c:104
+#: dpkg-split/main.c:110
 msgid "part size is far too large or is not positive"
 msgstr "tamanho da part é muito grande ou não é positivo"
 
-#: 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 "tamanho da part deve ser pelo menos %dk (para permitir cabeçalho)"
@@ -5935,6 +5918,68 @@ msgstr "arquivo fonte `%.250s' n
 msgid "unable to exec mksplit"
 msgstr "não é possível executar 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 ""
+#~ "Isso é um software livre; veja a Licença Pública Geral (GPL) versão 2 ou\n"
+#~ "mais atual para condições de cópia.  Não há NENHUMA garantia.\n"
+#~ "Veja "
+
+#~ msgid " --licence for copyright and license details.\n"
+#~ msgstr " --licence para copyright e detalhes de licenciamento.\n"
+
+#~ msgid "Debian `"
+#~ msgstr "Debian GNU/Linux `"
+
+#~ msgid "Usage: "
+#~ msgstr "Uso: "
+
+#~ 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 ""
+#~ "Versão %s.\n"
+#~ "Copyright (C) 1994-1996 Ian Jackson.\n"
+#~ "Copyright (C) 2000,2001 Wichert Akkerman.\n"
+#~ "Este é um software livre; veja a Licença Pública Geral GNU versão 2\n"
+#~ "ou posterior para condições de cópia. Não há NENHUMA garantia. Veja\n"
+#~ "dselect --licence para detalhes.\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 ""
+#~ "Uso:   dselect [opções]\n"
+#~ "       dselect [opções] ação ...\n"
+#~ "Opções:  --admindir <diretório>  (padrão é /var/lib/dpkg)\n"
+#~ "         --help  --version  --licence  --expert  --debug <arquivo> |\n"
+#~ " -D<arquivo>\n"
+#~ "          --colour screenpart:[foreground],[background][:attr[+attr+..]]\n"
+#~ "Ações:    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. Isso é software livre; veja a \n"
+#~ "Licença Pública Geral GNU versão 2 ou superior para condições de cópia.\n"
+#~ "NÃO existe garantia. Veja dpkg-split --licence para detalhes.\n"
+
 #~ msgid "Type md5sum --help for help."
 #~ msgstr "Digite md5sum --help para ajuda."
 

po/ro.po

@@ -17,7 +17,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dpkg 1.13\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: 2005-11-25 00:33+0200\n"
 "Last-Translator: Eddy Petrişor <eddy.petrisor@gmail.com>\n"
 "Language-Team: Romanian (Română) <debian-l10n-romanian@lists.debian.org>\n"
@@ -2171,90 +2171,89 @@ msgid "failed to exec rm for cleanup"
 msgstr "eşec la execuţia rm pentru curăţare"
 
 #: 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 "' versiunea programului de managment al pachetelor "
 
-#: 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 ""
 "Acesta este soft liber; vezi GNU General Public Licence versiunea 2 sau\n"
-"ulterioară pentru condiţiile de copiere. Nu există NICI o garanţie.\n"
-"Vezi "
-
-#: src/main.c:50 src/query.c:465
-msgid " --licence for copyright and license details.\n"
-msgstr " --licence pentru drepturile de copiere şi detalii despre licenţă.\n"
+"ulterioară pentru condiţiile de copiere. NU există NICI o garanţie.\n"
+"Vezi dpkg-deb --licence pentru detalii.\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 ""
@@ -2341,14 +2340,15 @@ msgstr ""
 "\n"
 "Pentru o interfaţă mai prietenoasă folosiţi `dselect' sau 'aptitude'.\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 "
@@ -2367,17 +2367,17 @@ msgstr ""
 "Opţiunile marcate cu [*] produc foarte mult text la ieşire - redirectaţi-le "
 "prin „less” sau „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 "acţiuni în conflict --%s şi --%s"
 
-#: src/main.c:189
+#: src/main.c:191
 #, c-format
 msgid "Warning: obsolete option `--%s'\n"
 msgstr "Avertisment: opţiune învechită `--%s'\n"
 
-#: src/main.c:197
+#: src/main.c:199
 #, c-format
 msgid ""
 "%s debugging option, --debug=<octal> or -D<octal>:\n"
@@ -2416,29 +2416,29 @@ msgstr ""
 "Opţiunile de depanare pot fi combinate folosind \"sau\" pe biţi.\n"
 "A se nota că înţelesul şi valorile se pot schimba.\n"
 
-#: src/main.c:216
+#: src/main.c:218
 msgid "--debug requires an octal argument"
 msgstr "--debug necesită un argument octal"
 
-#: src/main.c:240
+#: src/main.c:242
 #, c-format
 msgid "null package name in --ignore-depends comma-separated list `%.250s'"
 msgstr ""
 "lipsă nume de pachet în lista separată prin virgule `%.250s' de la --ignore-"
 "depends"
 
-#: 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 necesită un nume valid de pachet. `%.250s' nu este; %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 "întreg invalid pentru --%s: `%.250s'"
 
-#: src/main.c:292
+#: src/main.c:294
 #, c-format
 msgid ""
 "%s forcing options - control behaviour when problems found:\n"
@@ -2525,48 +2525,48 @@ msgstr ""
 "sistemul dvs.\n"
 "Forţarea opţiunilor marcate cu [*] sunt implicit activate.\n"
 
-#: src/main.c:337
+#: src/main.c:339
 #, c-format
 msgid "unknown force/refuse option `%.*s'"
 msgstr "opţiune de forţare/refuzare necunoscută `%.*s'"
 
-#: src/main.c:442 src/main.c:446
+#: src/main.c:444 src/main.c:448
 msgid "couldn't malloc in execbackend"
 msgstr "nu am putut executa malloc în aplicaţia propriu-zisă"
 
-#: src/main.c:444 src/main.c:451
+#: src/main.c:446 src/main.c:453
 msgid "couldn't strdup in execbackend"
 msgstr "nu am putut executa strdup în aplicaţia propriu-zisă"
 
-#: src/main.c:455
+#: src/main.c:457
 #, c-format
 msgid "failed to exec %s"
 msgstr "eşec la execuţia %s"
 
-#: src/main.c:467
+#: src/main.c:469
 msgid "--command-fd takes 1 argument, not 0"
 msgstr "--command-fd ia 1 argument, nu 0"
 
-#: src/main.c:468
+#: src/main.c:470
 msgid "--command-fd only takes 1 argument"
 msgstr "--command-fd ia doar 1 argument"
 
-#: src/main.c:470
+#: src/main.c:472
 msgid "invalid number for --command-fd"
 msgstr "număr invalid pentru --command-fd"
 
-#: src/main.c:472
+#: src/main.c:474
 #, c-format
 msgid "couldn't open `%i' for stream"
 msgstr "nu am putut deschide „%i” pentru fluxul de date"
 
-#: src/main.c:497
+#: src/main.c:499
 #, c-format
 msgid "unexpected eof before end of line %d"
 msgstr "sfârşit neaşteptat de fişier înainte de terminarea liniei %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 "e necesară o opţiune de acţiune"
 
@@ -2966,46 +2966,31 @@ msgstr ""
 "Folosiţi dpkg --info (= dpkg-deb --info) ca să examinaţi fişierele arhivei,\n"
 "şi dpkg --contents (= dpkg-deb --contents) ca să-i afişaţi conţinutul.\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 "' unealtă de interogare a programului de management al pachetelor\n"
 
-#: src/query.c:473
-#, c-format
-msgid "Usage: "
-msgstr "Sintaxă: "
-
-#: src/query.c:474
+#: 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 ""
 " [<opţiune>] <comandă>\n"
 "Comenzi:\n"
@@ -3037,10 +3022,25 @@ msgstr ""
 "lăţimea nu\n"
 "  este negativă; în acest caz se va folosi aliniere la stânga. \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 ""
 "Folosiţi --help pentru ajutor legat de chestionarea pachetelor;\n"
@@ -4109,107 +4109,99 @@ msgid "menu"
 msgstr "meniu"
 
 #: 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 "Interfaţă de manipulare a pachetelor Debian „%s”."
 
 #: 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 ""
-"Versiunea %s.\n"
-"Copyright (C) 1994-1996 Ian Jackson.\n"
-"Copyright (C) 2000,2001 Wichert Akkerman.\n"
-"Acesta este soft liber; vezi GNU General Public Licence versiunea 2\n"
-"sau ulterioară pentru condiţiile de copiere. Nu există NICI O garanţie. "
-"Vezi\n"
-"dselect --licence pentru detalii.\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 ""
-"Sintaxă: dselect [opţiuni]\n"
-"         dselect [opţiuni] acţiune ...\n"
-"Opţiuni:  --admindir <director>  (implicit este /var/lib/dpkg)\n"
-"          --help  --version  --licence  --expert  --debug <fişier> | -"
-"D<fişier>\n"
-"          --colour componentă ecran:[text],[fond][:atribut[+atribut+..]]\n"
-"Acţiuni:  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 "Componente ecran:\n"
 
-#: dselect/main.cc:182
+#: dselect/main.cc:192
 #, c-format
 msgid "Colours:\n"
 msgstr "Culori:\n"
 
-#: dselect/main.cc:187
+#: dselect/main.cc:197
 #, c-format
 msgid "Attributes:\n"
 msgstr "Atribute:\n"
 
-#: dselect/main.cc:207
+#: dselect/main.cc:217
 #, c-format
 msgid "couldn't open debug file `%.255s'\n"
 msgstr "nu pot deschide fişierul de depanare „%.255s”\n"
 
-#: dselect/main.cc:222
+#: dselect/main.cc:232
 #, c-format
 msgid "Invalid %s `%s'\n"
 msgstr "Invalid %s „%s”\n"
 
-#: dselect/main.cc:239
+#: dselect/main.cc:249
 msgid "screen part"
 msgstr "parte ecran"
 
-#: dselect/main.cc:245
+#: dselect/main.cc:255
 msgid "Null colour specification\n"
 msgstr "Lipsă specificaţie de culoare\n"
 
-#: dselect/main.cc:253 dselect/main.cc:258
+#: dselect/main.cc:263 dselect/main.cc:268
 msgid "colour"
 msgstr "culoare"
 
-#: dselect/main.cc:266
+#: dselect/main.cc:276
 msgid "colour attribute"
 msgstr "atribut culoare"
 
-#: dselect/main.cc:300
+#: dselect/main.cc:310
 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:302
+#: dselect/main.cc:312
 msgid "Terminal does not appear to support highlighting.\n"
 msgstr "Terminalul nu pare să suporte evidenţiere.\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 ""
 "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"
 
-#: dselect/main.cc:306
+#: dselect/main.cc:317
 msgid "terminal lacks necessary features, giving up"
 msgstr "terminalul nu suportă cerinţele necesare, abandonez"
 
-#: dselect/main.cc:384
+#: dselect/main.cc:395
 msgid ""
 "\n"
 "\n"
@@ -4223,7 +4215,7 @@ msgstr ""
 "Apăsaţi <enter> pentru confirmarea selecţiei.  ^L redesenează ecranul.\n"
 "\n"
 
-#: dselect/main.cc:398
+#: dselect/main.cc:410
 msgid ""
 "\n"
 "\n"
@@ -4233,11 +4225,11 @@ msgstr ""
 "\n"
 "Acces doar în citire: este disponibilă doar vizualizarea selecţiilor!"
 
-#: dselect/main.cc:417
+#: dselect/main.cc:429
 msgid "failed to getch in main menu"
 msgstr "eşec în getch în meniul principal"
 
-#: dselect/main.cc:490
+#: dselect/main.cc:502
 #, c-format
 msgid "unknown action string `%.50s'"
 msgstr "şir acţiune necunoscut „%.50s”"
@@ -5475,63 +5467,44 @@ msgstr "Eroare în format"
 msgid "--contents takes exactly one argument"
 msgstr "--contents ia exact un argument"
 
-#: 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 "' versiunea backend-ului pentru arhiva de pachete "
 
-#: 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 ""
-"Acesta este soft liber; vezi GNU General Public Licence versiunea 2 sau\n"
-"ulterioară pentru condiţiile de copiere. NU există NICI o garanţie.\n"
-"Vezi dpkg-deb --licence pentru detalii.\n"
-
-#: dpkg-deb/main.c:58
-#, fuzzy
+#: 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"
-"\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"
+"  -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"
-"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 ""
 "Comanda:\n"
 "  -b|--build <director> [<deb>]    construieşte o arhivă.\n"
@@ -5578,7 +5551,16 @@ msgstr ""
 "Pachetele despachetate\n"
 "cu `dpkg-deb --extract' vor fi instalate incorect !\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."
@@ -5587,7 +5569,7 @@ msgstr ""
 "Tastaţi dpkg --help pentru ajutor despre instalarea şi dezinstalarea "
 "pachetelor."
 
-#: dpkg-deb/main.c:176
+#: dpkg-deb/main.c:181
 #, c-format
 msgid "unknown compression type `%s'!"
 msgstr "tip de compresie necunoscut „%s”!"
@@ -5761,44 +5743,42 @@ msgstr "--join necesită unul sau mai multe fişiere volum ca argumente"
 msgid "part %d is missing"
 msgstr "volumul %d lipseşte"
 
-#: 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 ""
 "Unealta Debian GNU/Linux `dpkg-split' de împărţire/realipire de pachete; "
 "versiunea "
 
-#: 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. Acesta este soft liber; vezi\n"
-"GNU General Public Licence versiunea 2 sau ulterioară pentru condiţiile de "
-"copiere.\n"
-"NU există NICI o garanţie. Vezi dpkg-split --licence pentru detalii.\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 ""
@@ -5826,30 +5806,30 @@ msgstr ""
 "\n"
 "Starea de ieşire: 0 = OK;  1 = -a nu este un volum;  2 = problemă!\n"
 
-#: dpkg-split/main.c:69
+#: dpkg-split/main.c:75
 msgid "Type dpkg-split --help for help."
 msgstr "Tastaţi dpkg-split --help pentru ajutor."
 
-#: dpkg-split/main.c:79
+#: dpkg-split/main.c:85
 #, c-format
 msgid "error reading %s"
 msgstr "eroare la citire %s"
 
-#: dpkg-split/main.c:83
+#: dpkg-split/main.c:89
 #, c-format
 msgid "error reading %.250s"
 msgstr "eroare la citire %.250s"
 
-#: dpkg-split/main.c:84
+#: dpkg-split/main.c:90
 #, c-format
 msgid "unexpected end of file in %.250s"
 msgstr "sfârşit de fişier neaşteptat în %.250s"
 
-#: dpkg-split/main.c:104
+#: dpkg-split/main.c:110
 msgid "part size is far too large or is not positive"
 msgstr "dimensiunea volumului este foarte mare sau nu este pozitivă"
 
-#: 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 ""
@@ -5989,6 +5969,71 @@ msgstr "fişierul sursă „%.250s” nu este un fişier propriu-zis"
 msgid "unable to exec mksplit"
 msgstr "nu pot executa comanda 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 ""
+#~ "Acesta este soft liber; vezi GNU General Public Licence versiunea 2 sau\n"
+#~ "ulterioară pentru condiţiile de copiere. Nu există NICI o garanţie.\n"
+#~ "Vezi "
+
+#~ msgid " --licence for copyright and license details.\n"
+#~ msgstr ""
+#~ " --licence pentru drepturile de copiere şi detalii despre licenţă.\n"
+
+#~ msgid "Debian `"
+#~ msgstr "Debian `"
+
+#~ msgid "Usage: "
+#~ msgstr "Sintaxă: "
+
+#~ 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 ""
+#~ "Versiunea %s.\n"
+#~ "Copyright (C) 1994-1996 Ian Jackson.\n"
+#~ "Copyright (C) 2000,2001 Wichert Akkerman.\n"
+#~ "Acesta este soft liber; vezi GNU General Public Licence versiunea 2\n"
+#~ "sau ulterioară pentru condiţiile de copiere. Nu există NICI O garanţie. "
+#~ "Vezi\n"
+#~ "dselect --licence pentru detalii.\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 ""
+#~ "Sintaxă: dselect [opţiuni]\n"
+#~ "         dselect [opţiuni] acţiune ...\n"
+#~ "Opţiuni:  --admindir <director>  (implicit este /var/lib/dpkg)\n"
+#~ "          --help  --version  --licence  --expert  --debug <fişier> | -"
+#~ "D<fişier>\n"
+#~ "          --colour componentă ecran:[text],[fond][:atribut[+atribut+..]]\n"
+#~ "Acţiuni:  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. Acesta este soft liber; vezi\n"
+#~ "GNU General Public Licence versiunea 2 sau ulterioară pentru condiţiile "
+#~ "de copiere.\n"
+#~ "NU există NICI o garanţie. Vezi dpkg-split --licence pentru detalii.\n"
+
 #~ msgid ""
 #~ "dpkg: unexpected output from `%s --print-libgcc-file-name':\n"
 #~ " `%s'\n"

po/ru.po

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dpkg_po_ru\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: 2005-10-22 12:55+0400\n"
 "Last-Translator: Yuri Kozlov <kozlov.y@gmail.com>\n"
 "Language-Team: Russian <debian-l10n-russian@lists.debian.org>\n"
@@ -2189,92 +2189,90 @@ msgid "failed to exec rm for cleanup"
 msgstr "не удалось выполнить команду rm для очистки каталога"
 
 #: 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 ", система управления пакетами версии "
 
-#: 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 ""
 "Это свободное программное обеспечение. См. условия распространения в\n"
 "Универсальной общественной лицензии GNU версии 2 или более поздней.\n"
-"НИКАКИЕ гарантии не предоставляются. Чтобы получить более подробную "
-"информацию\n"
-"об авторских правах и условиях лицензии, выполните команду"
-
-#: src/main.c:50 src/query.c:465
-msgid " --licence for copyright and license details.\n"
-msgstr " --licence.\n"
+"НИКАКИЕ гарантии не предоставляются. Чтобы получить более подробную\n"
+"информацию, выполните команду dpkg-deb --licence.\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 ""
@@ -2375,14 +2373,15 @@ msgstr ""
 "Программы `dselect' или 'aptitude' предоставляют дружественный интерфейс\n"
 "управления пакетами.\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 "
@@ -2403,17 +2402,17 @@ msgstr ""
 "Параметры, отмеченные [*], выводят большое количество информации.\n"
 "Объедините их в конвейер с программами `less' или `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 "несовместимые действия --%s и --%s"
 
-#: src/main.c:189
+#: src/main.c:191
 #, c-format
 msgid "Warning: obsolete option `--%s'\n"
 msgstr "Предупреждение: устаревший параметр --%s\n"
 
-#: src/main.c:197
+#: src/main.c:199
 #, c-format
 msgid ""
 "%s debugging option, --debug=<octal> or -D<octal>:\n"
@@ -2454,30 +2453,30 @@ msgstr ""
 "Параметры отладки объединяются побитовой операцией \"или\".\n"
 "Имейте в виду, что значения и их смысловая нагрузка могут быть изменены.\n"
 
-#: src/main.c:216
+#: src/main.c:218
 msgid "--debug requires an octal argument"
 msgstr "параметр --debug принимает в качестве аргумента восьмеричное число"
 
-#: src/main.c:240
+#: src/main.c:242
 #, c-format
 msgid "null package name in --ignore-depends comma-separated list `%.250s'"
 msgstr ""
 "пустое имя пакета в разделённом запятыми списке игнорируемых зависимостей "
 "%.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 требует корректного имени пакета. %.250s таковым не "
 "является: %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 "аргумент --%s (%.250s) не является допустимым целочисленным значением"
 
-#: src/main.c:292
+#: src/main.c:294
 #, c-format
 msgid ""
 "%s forcing options - control behaviour when problems found:\n"
@@ -2569,48 +2568,48 @@ msgstr ""
 "повредить\n"
 "вашу систему. Параметры, отмеченные [*], задействованы по умолчанию.\n"
 
-#: src/main.c:337
+#: src/main.c:339
 #, c-format
 msgid "unknown force/refuse option `%.*s'"
 msgstr "недопустимый параметр игнорирования/обработки проблем %.*s"
 
-#: src/main.c:442 src/main.c:446
+#: src/main.c:444 src/main.c:448
 msgid "couldn't malloc in execbackend"
 msgstr "не удалось выделить память при работе функции execbackend"
 
-#: src/main.c:444 src/main.c:451
+#: src/main.c:446 src/main.c:453
 msgid "couldn't strdup in execbackend"
 msgstr "не удалось скопировать строку при работе функции execbackend"
 
-#: src/main.c:455
+#: src/main.c:457
 #, c-format
 msgid "failed to exec %s"
 msgstr "не удалось запустить %s"
 
-#: src/main.c:467
+#: src/main.c:469
 msgid "--command-fd takes 1 argument, not 0"
 msgstr "параметр --command-fd принимает один аргумент, а не ноль"
 
-#: src/main.c:468
+#: src/main.c:470
 msgid "--command-fd only takes 1 argument"
 msgstr "параметр --command-fd принимает только один аргумент"
 
-#: src/main.c:470
+#: src/main.c:472
 msgid "invalid number for --command-fd"
 msgstr "аргумент параметра --command-fd не является числом"
 
-#: src/main.c:472
+#: src/main.c:474
 #, c-format
 msgid "couldn't open `%i' for stream"
 msgstr "не удалось открыть поток дескриптора файла %i"
 
-#: src/main.c:497
+#: src/main.c:499
 #, c-format
 msgid "unexpected eof before end of line %d"
 msgstr "неожиданный конец файла, ещё не кончилась строка %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 "требуется параметр действия"
 
@@ -3014,46 +3013,31 @@ msgstr ""
 "для вывода списка файлов в них -- команду dpkg--contents (dpkg-deb --"
 "contents).\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 ": обработчик запросов системы управления пакетами\n"
 
-#: src/query.c:473
-#, c-format
-msgid "Usage: "
-msgstr "Вызов: "
-
-#: 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 ""
 " [<параметры>] <команда>\n"
 "Команды:\n"
@@ -3084,10 +3068,25 @@ msgstr ""
 "  ${поле[;ширина]}. Поля выравниваются по правому краю, если ширина\n"
 "  неотрицательна, и по левому в противном случае.\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 ""
 "Для вывода справки об использовании dpkg-query используйте --help.\n"
@@ -4145,107 +4144,99 @@ msgid "menu"
 msgstr "меню"
 
 #: 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 GNU/Linux %s."
 
 #: 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 ""
-"Версия %s.\n"
-"Copyright (C) 1994-1996 Ian Jackson.\n"
-"Copyright (C) 2000,2001 Wichert Akkerman.\n"
-"Это свободное программное обеспечение. См. условия распространения в\n"
-"Универсальной общественной лицензии GNU версии 2 или более поздней.\n"
-"НИКАКИЕ гарантии не предоставляются. Чтобы получить более подробную\n"
-"информацию, введите dselect --licence.\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 ""
-"Вызов: dselect [параметры]\n"
-"       dselect [параметры] действие ...\n"
-"Параметры: --admindir <каталог>   (по умолчанию /var/lib/dpkg)\n"
-"           --help  --version  --licence  --expert  --debug <файл> | -"
-"D<файл>\n"
-"           --colour сектор экрана:[тон],[фон][:атрибут[+атрибут+..]]\n"
-"Действия: 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 "Секторы экрана:\n"
 
-#: dselect/main.cc:182
+#: dselect/main.cc:192
 #, c-format
 msgid "Colours:\n"
 msgstr "Цвета:\n"
 
-#: dselect/main.cc:187
+#: dselect/main.cc:197
 #, c-format
 msgid "Attributes:\n"
 msgstr "Атрибуты:\n"
 
-#: dselect/main.cc:207
+#: dselect/main.cc:217
 #, c-format
 msgid "couldn't open debug file `%.255s'\n"
 msgstr "не удалось открыть отладочный файл %.255s\n"
 
-#: dselect/main.cc:222
+#: dselect/main.cc:232
 #, c-format
 msgid "Invalid %s `%s'\n"
 msgstr "Некорректный %s %s\n"
 
-#: dselect/main.cc:239
+#: dselect/main.cc:249
 msgid "screen part"
 msgstr "сектор экрана"
 
-#: dselect/main.cc:245
+#: dselect/main.cc:255
 msgid "Null colour specification\n"
 msgstr "Задающие цвет значения пусты\n"
 
-#: dselect/main.cc:253 dselect/main.cc:258
+#: dselect/main.cc:263 dselect/main.cc:268
 msgid "colour"
 msgstr "цвет"
 
-#: dselect/main.cc:266
+#: dselect/main.cc:276
 msgid "colour attribute"
 msgstr "атрибут цвета"
 
-#: dselect/main.cc:300
+#: dselect/main.cc:310
 msgid "Terminal does not appear to support cursor addressing.\n"
 msgstr "Терминал не поддерживает позиционирование курсора.\n"
 
-#: dselect/main.cc:302
+#: dselect/main.cc:312
 msgid "Terminal does not appear to support highlighting.\n"
 msgstr "Терминал не поддерживает подсветку.\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 ""
 "Задайте верное значение переменной TERM, используйте более функциональный\n"
 "терминал или работайте с инструментарием управления отдельными пакетами "
 
-#: dselect/main.cc:306
+#: dselect/main.cc:317
 msgid "terminal lacks necessary features, giving up"
 msgstr "у терминала отсутствуют необходимые возможности, сдаёмся"
 
-#: dselect/main.cc:384
+#: dselect/main.cc:395
 msgid ""
 "\n"
 "\n"
@@ -4260,7 +4251,7 @@ msgstr ""
 "Нажмите ввод для выбора действия.  ^L -- перерисовать экран.\n"
 "\n"
 
-#: dselect/main.cc:398
+#: dselect/main.cc:410
 msgid ""
 "\n"
 "\n"
@@ -4270,11 +4261,11 @@ msgstr ""
 "\n"
 "Доступ только для чтения: доступен только просмотр состояния пакетов!"
 
-#: dselect/main.cc:417
+#: dselect/main.cc:429
 msgid "failed to getch in main menu"
 msgstr "ожидание нажатия клавиши в главном меню завершилось неудачно"
 
-#: dselect/main.cc:490
+#: dselect/main.cc:502
 #, c-format
 msgid "unknown action string `%.50s'"
 msgstr "неизвестное действие %.50s"
@@ -5523,63 +5514,44 @@ msgstr "Неверный формат"
 msgid "--contents takes exactly one argument"
 msgstr "параметр --contents принимает ровно один аргумент"
 
-#: 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 "' программа работы с архивами пакетов; версия "
 
-#: 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 ""
-"Это свободное программное обеспечение. См. условия распространения в\n"
-"Универсальной общественной лицензии GNU версии 2 или более поздней.\n"
-"НИКАКИЕ гарантии не предоставляются. Чтобы получить более подробную\n"
-"информацию, выполните команду dpkg-deb --licence.\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"
-"\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"
+"  -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"
-"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 ""
 "Вызов:\n"
 "  -b|--build <каталог> [<архив>]    собрать архив.\n"
@@ -5628,7 +5600,16 @@ msgstr ""
 "интерфейс управления пакетами `dselect' или `aptitude'. Пакеты, \n"
 "распакованные с помощью dpkg-deb --extract, будут установлены неправильно!\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."
@@ -5637,7 +5618,7 @@ msgstr ""
 "Чтобы получить информацию об установке и удалении пакетов, введите dpkg --"
 "help."
 
-#: dpkg-deb/main.c:176
+#: dpkg-deb/main.c:181
 #, c-format
 msgid "unknown compression type `%s'!"
 msgstr "неизвестный тип сжатия --`%s'"
@@ -5808,44 +5789,41 @@ msgstr ""
 msgid "part %d is missing"
 msgstr "отсутствует часть %d"
 
-#: 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: программа разбиения/объединения пакетов, версия "
 
-#: 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. Это свободное программное обеспечение.\n"
-"См. условия распространения в Универсальной общественной лицензии GNU\n"
-"версии 2 или более поздней. НИКАКИЕ гарантии не предоставляются. Чтобы\n"
-"получить более подробную информацию, выполните команду dpkg-split --"
-"licence.\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 ""
@@ -5874,30 +5852,30 @@ msgstr ""
 "\n"
 "Код возврата: 0 = OK;  1 = -a не является частью;  2 = проблема!\n"
 
-#: dpkg-split/main.c:69
+#: dpkg-split/main.c:75
 msgid "Type dpkg-split --help for help."
 msgstr "Чтобы получить справку, введите dpkg-split --help."
 
-#: dpkg-split/main.c:79
+#: dpkg-split/main.c:85
 #, c-format
 msgid "error reading %s"
 msgstr "ошибка чтения %s"
 
-#: dpkg-split/main.c:83
+#: dpkg-split/main.c:89
 #, c-format
 msgid "error reading %.250s"
 msgstr "ошибка чтения %.250s"
 
-#: dpkg-split/main.c:84
+#: dpkg-split/main.c:90
 #, c-format
 msgid "unexpected end of file in %.250s"
 msgstr "неожиданный конец файла %.250s"
 
-#: dpkg-split/main.c:104
+#: dpkg-split/main.c:110
 msgid "part size is far too large or is not positive"
 msgstr "размер части слишком велик или не положителен"
 
-#: 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 "размер части должен быть, по крайней мере, %dКб (размер заголовка)"
@@ -6033,3 +6011,71 @@ msgstr "исходный файл %.250s не является обычным ф
 #: dpkg-split/split.c:70
 msgid "unable to exec mksplit"
 msgstr "не удалось запустить 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 ""
+#~ "Это свободное программное обеспечение. См. условия распространения в\n"
+#~ "Универсальной общественной лицензии GNU версии 2 или более поздней.\n"
+#~ "НИКАКИЕ гарантии не предоставляются. Чтобы получить более подробную "
+#~ "информацию\n"
+#~ "об авторских правах и условиях лицензии, выполните команду"
+
+#~ msgid " --licence for copyright and license details.\n"
+#~ msgstr " --licence.\n"
+
+#~ msgid "Debian `"
+#~ msgstr "Debian"
+
+#~ msgid "Usage: "
+#~ msgstr "Вызов: "
+
+#~ 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 ""
+#~ "Версия %s.\n"
+#~ "Copyright (C) 1994-1996 Ian Jackson.\n"
+#~ "Copyright (C) 2000,2001 Wichert Akkerman.\n"
+#~ "Это свободное программное обеспечение. См. условия распространения в\n"
+#~ "Универсальной общественной лицензии GNU версии 2 или более поздней.\n"
+#~ "НИКАКИЕ гарантии не предоставляются. Чтобы получить более подробную\n"
+#~ "информацию, введите dselect --licence.\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 ""
+#~ "Вызов: dselect [параметры]\n"
+#~ "       dselect [параметры] действие ...\n"
+#~ "Параметры: --admindir <каталог>   (по умолчанию /var/lib/dpkg)\n"
+#~ "           --help  --version  --licence  --expert  --debug <файл> | -"
+#~ "D<файл>\n"
+#~ "           --colour сектор экрана:[тон],[фон][:атрибут[+атрибут+..]]\n"
+#~ "Действия: 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. Это свободное программное "
+#~ "обеспечение.\n"
+#~ "См. условия распространения в Универсальной общественной лицензии GNU\n"
+#~ "версии 2 или более поздней. НИКАКИЕ гарантии не предоставляются. Чтобы\n"
+#~ "получить более подробную информацию, выполните команду dpkg-split --"
+#~ "licence.\n"

po/sk.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dpkg 1.13\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: 2005-01-08 17:21-0500\n"
 "Last-Translator: Roman Benko <benco@acid.sk>\n"
 "Language-Team: Slovak <sk-i18n@lists.linux.sk>\n"
@@ -2132,92 +2132,90 @@ msgid "failed to exec rm for cleanup"
 msgstr "failed to exec rm for cleanup"
 
 #: 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 "' verzia programu na údr¾bu balíkov "
 
-#: 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 ""
-"Toto je slobodný software; podrobnej¹ie informácie o pravidlách kopírovania "
-"nájdete\n"
-"v GNU General Public Licence verzia 2 alebo neskor¹ej. Záruka sa "
-"neposkytuje.\n"
-"Pozrite "
-
-#: src/main.c:50 src/query.c:465
-msgid " --licence for copyright and license details.\n"
-msgstr "--licencia pre copyright a detaily o licencii.\n"
+"Toto je slobodný software; podrobnosti o pravidlách kopírovania\n"
+"nájdete v GNU General Public Licence verzia 2 alebo neskor¹ej.\n"
+"Záruka sa neposkytuje.  Pou¾itím dpkg-deb --licence získate viac "
+"informácií.\n"
 
-#: src/main.c:58
+#: 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 ""
@@ -2305,7 +2303,7 @@ msgstr ""
 "Pou¾ite `dselect' alebo 'aptitude' pre u¾ívateµsky prívetivé rozhranie ku "
 "správe balíkov.\n"
 
-#: src/main.c:119
+#: src/main.c:121
 #, fuzzy
 msgid ""
 "Type dpkg --help for help about installing and deinstalling packages [*];\n"
@@ -2313,7 +2311,7 @@ msgid ""
 "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 "
@@ -2329,17 +2327,17 @@ msgstr ""
 "\n"
 "Voµby oznaèené [*] produkujú rozsiahly výstup - pou¾ite `less' alebo `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 "odporujúce si akcie --%s a --%s"
 
-#: src/main.c:189
+#: src/main.c:191
 #, c-format
 msgid "Warning: obsolete option `--%s'\n"
 msgstr "Upozornenie: zastaralá voµba `--%s'\n"
 
-#: src/main.c:197
+#: src/main.c:199
 #, c-format
 msgid ""
 "%s debugging option, --debug=<octal> or -D<octal>:\n"
@@ -2376,27 +2374,27 @@ msgstr ""
 "Ladiace voµby mô¾u by» mixované pou¾itím bitwise-or.\n"
 "Poznámka: významy a hodnoty sa mô¾u èasto meni».\n"
 
-#: src/main.c:216
+#: src/main.c:218
 msgid "--debug requires an octal argument"
 msgstr "--debug vy¾aduje osmièkový argument"
 
-#: src/main.c:240
+#: src/main.c:242
 #, c-format
 msgid "null package name in --ignore-depends comma-separated list `%.250s'"
 msgstr ""
 "prázdny názov balíku v dvojbodkou oddelenom zozname --ignore-depends `%.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 vy¾aduje platný názov balíku. `%.250s' nie je; %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 "neplatné èíslo pre --%s: `%.250s'"
 
-#: src/main.c:292
+#: src/main.c:294
 #, c-format
 msgid ""
 "%s forcing options - control behaviour when problems found:\n"
@@ -2467,48 +2465,48 @@ msgstr ""
 "in¹taláciu.\n"
 "Vnútenie volieb oznaèených [*] je predvolene povelené.\n"
 
-#: src/main.c:337
+#: src/main.c:339
 #, c-format
 msgid "unknown force/refuse option `%.*s'"
 msgstr "neznáma vnucovacia/odmietacia voµba `%.*s'"
 
-#: src/main.c:442 src/main.c:446
+#: src/main.c:444 src/main.c:448
 msgid "couldn't malloc in execbackend"
 msgstr "nemô¾e vykona» funkciu malloc v execbackend"
 
-#: src/main.c:444 src/main.c:451
+#: src/main.c:446 src/main.c:453
 msgid "couldn't strdup in execbackend"
 msgstr "nemô¾e vykona» funkciu strdup v execbackend"
 
-#: src/main.c:455
+#: src/main.c:457
 #, c-format
 msgid "failed to exec %s"
 msgstr "nie je mo¾né spusti» %s"
 
-#: src/main.c:467
+#: src/main.c:469
 msgid "--command-fd takes 1 argument, not 0"
 msgstr "--command-fd vy¾aduje jeden paramater, nie nula"
 
-#: src/main.c:468
+#: src/main.c:470
 msgid "--command-fd only takes 1 argument"
 msgstr "--command-fd vy¾aduje len jeden argument"
 
-#: src/main.c:470
+#: src/main.c:472
 msgid "invalid number for --command-fd"
 msgstr "neplatné èíslo pre --command-fd"
 
-#: src/main.c:472
+#: src/main.c:474
 #, c-format
 msgid "couldn't open `%i' for stream"
 msgstr "nie je mo¾né otvori» `%i' pre tok"
 
-#: src/main.c:497
+#: src/main.c:499
 #, c-format
 msgid "unexpected eof before end of line %d"
 msgstr "neèakaný koniec súboru pred koncom riadku %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 "potrebujem zada» akciu"
 
@@ -2900,46 +2898,31 @@ msgstr ""
 "Pou¾ite dpkg --info (= dpkg-deb --info) k preskúmaniu archívnych súborov,\n"
 "a dpkg --contents (= dpkg-deb --contents) pre vypísanie ich obsahu.\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 "' dotazovací nástroj programu na správu balíkov\n"
 
-#: src/query.c:473
-#, c-format
-msgid "Usage: "
-msgstr "Pou¾itie: "
-
-#: src/query.c:474
+#: 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 ""
 " [<voµba>] <príkaz>\n"
 "Príkazy:\n"
@@ -2968,10 +2951,25 @@ msgstr ""
 "  Polia budú zarovnané doprava, ak bude ¹írka záporná, inak bude pou¾ité\n"
 "   zarovnanie doµava. \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 ""
 "Pou¾ite --help pre nápovedu o dopytovaných balíkoch.\n"
@@ -4031,108 +4029,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' rozhranie pre správu balíkov"
 
 #: 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 ""
-"Verzia %s.\n"
-"Copyright (C) 1994-1996 Ian Jackson.\n"
-"Copyright (C) 2000,2001 Wichrt Akkerman.\n"
-"Toto je slobodný software; podrobnosti o pravidlách kopírovania\n"
-"nájdete v GNU General Public Licence vo verzii 2 alebo neskor¹ej.  Záruka sa "
-"neposkytuje.\n"
-"Pou¾ite dselect --licence pre viac informácií.\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 ""
-"Pou¾itie: dselect [voµby]\n"
-"          dselect [voµby] akcia ...\n"
-"Options:  --admindir <adresár>  (predvolený je /var/lib/dpkg)\n"
-"          --help  --version  --licence  --expert  --debug <súbor> | -"
-"D<súbor>\n"
-"          --colour screenpart:[foreground],[background][:attr[+attr+..]]\n"
-"Akcie:    prístup aktualizácia výber in¹talácia konfigurácia odstránenie "
-"koniec\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 "Èasti obrazovky:\n"
 
-#: dselect/main.cc:182
+#: dselect/main.cc:192
 #, c-format
 msgid "Colours:\n"
 msgstr "Farby:\n"
 
-#: dselect/main.cc:187
+#: dselect/main.cc:197
 #, c-format
 msgid "Attributes:\n"
 msgstr "Vlastnosti:\n"
 
-#: dselect/main.cc:207
+#: dselect/main.cc:217
 #, c-format
 msgid "couldn't open debug file `%.255s'\n"
 msgstr "nebolo mo¾né otvori» ladiaci súbor `%.255s'\n"
 
-#: dselect/main.cc:222
+#: dselect/main.cc:232
 #, c-format
 msgid "Invalid %s `%s'\n"
 msgstr "Nesprávny %s `%s'\n"
 
-#: dselect/main.cc:239
+#: dselect/main.cc:249
 msgid "screen part"
 msgstr "èas» obrazovky"
 
-#: dselect/main.cc:245
+#: dselect/main.cc:255
 msgid "Null colour specification\n"
 msgstr "®iadna farebná ¹pecifikácia\n"
 
-#: dselect/main.cc:253 dselect/main.cc:258
+#: dselect/main.cc:263 dselect/main.cc:268
 msgid "colour"
 msgstr "farba"
 
-#: dselect/main.cc:266
+#: dselect/main.cc:276
 msgid "colour attribute"
 msgstr "vlastnos» farby"
 
-#: dselect/main.cc:300
+#: dselect/main.cc:310
 msgid "Terminal does not appear to support cursor addressing.\n"
 msgstr "Terminál zdá sa nepodporuje adresovanie kurzoru.\n"
 
-#: dselect/main.cc:302
+#: dselect/main.cc:312
 msgid "Terminal does not appear to support highlighting.\n"
 msgstr "Nezdá sa, ¾e by terminál podporoval zvýraznenie.\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 ""
 "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 "
 
-#: dselect/main.cc:306
+#: dselect/main.cc:317
 msgid "terminal lacks necessary features, giving up"
 msgstr "terminálu chýbajú nevyhnutné zlo¾ky, konèím"
 
-#: dselect/main.cc:384
+#: dselect/main.cc:395
 msgid ""
 "\n"
 "\n"
@@ -4147,7 +4136,7 @@ msgstr ""
 "Stlaète <enter> pre potvrdenie výberu.   ^L prekreslí obrazovku.\n"
 "\n"
 
-#: dselect/main.cc:398
+#: dselect/main.cc:410
 msgid ""
 "\n"
 "\n"
@@ -4157,11 +4146,11 @@ msgstr ""
 "\n"
 "Prístup len na èítanie: mo¾ný je len prehµad výberov!"
 
-#: dselect/main.cc:417
+#: dselect/main.cc:429
 msgid "failed to getch in main menu"
 msgstr "zlyhala funkcia getch v hlavnom menu"
 
-#: dselect/main.cc:490
+#: dselect/main.cc:502
 #, c-format
 msgid "unknown action string `%.50s'"
 msgstr "neznámy re»azec akcie `%.50s'"
@@ -5380,64 +5369,44 @@ msgstr "Chyba vo form
 msgid "--contents takes exactly one argument"
 msgstr "--contents vy¾aduje práve jeden paramater"
 
-#: 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 "' verzia backendu pre archív balíku "
 
-#: 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 ""
-"Toto je slobodný software; podrobnosti o pravidlách kopírovania\n"
-"nájdete v GNU General Public Licence verzia 2 alebo neskor¹ej.\n"
-"Záruka sa neposkytuje.  Pou¾itím dpkg-deb --licence získate viac "
-"informácií.\n"
-
-#: dpkg-deb/main.c:58
-#, fuzzy
+#: 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"
-"\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"
+"  -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"
-"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 ""
 "Prikaz:\n"
 "  -b|--build <adresár> [<deb>]    vytvorí archív.\n"
@@ -5480,7 +5449,16 @@ msgstr ""
 "`dselect' pre u¾ívateµsky priateµskú správu balíkov.  Balíky rozbalené\n"
 "pomocou `dpkg-deb --extract' budú nain¹talované nesprávne !\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."
@@ -5488,7 +5466,7 @@ msgstr ""
 "Napí¹te dpkg-deb --help pre nápovedu o manipulácii s *.deb súbormi;\n"
 "Napí¹te dpkg --help pre nápovedu o in¹talácii a dein¹talácii balíkov."
 
-#: dpkg-deb/main.c:176
+#: dpkg-deb/main.c:181
 #, c-format
 msgid "unknown compression type `%s'!"
 msgstr "neznámy typ kompresie `%s'!"
@@ -5650,43 +5628,41 @@ msgstr "--join vy
 msgid "part %d is missing"
 msgstr "èas» %d chýba"
 
-#: 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' rodeµovací/spájací nástroj balíku; verzia "
 
-#: 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.  Toto je slobodný software; pre\n"
-"podmienky kopírovania pozrite GNU General Public Licence verziu 2 alebo "
-"neskor¹iu.\n"
-"Záruka sa neposkytuje.  Pou¾ite dpkg-split --licence pre získanie detailov.\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 ""
@@ -5714,30 +5690,30 @@ msgstr ""
 "\n"
 "Výstupný stav: 0 = OK;  1 = -a nie je súèas»ou;  2 = problémy!\n"
 
-#: dpkg-split/main.c:69
+#: dpkg-split/main.c:75
 msgid "Type dpkg-split --help for help."
 msgstr "Napí¹te dpkg-split --help pre nápovedu."
 
-#: dpkg-split/main.c:79
+#: dpkg-split/main.c:85
 #, c-format
 msgid "error reading %s"
 msgstr "chyba pri èítaní %s"
 
-#: dpkg-split/main.c:83
+#: dpkg-split/main.c:89
 #, c-format
 msgid "error reading %.250s"
 msgstr "chyba pri èítaní %.250s"
 
-#: dpkg-split/main.c:84
+#: dpkg-split/main.c:90
 #, c-format
 msgid "unexpected end of file in %.250s"
 msgstr "neoèakávaný koniec súboru v %.250s"
 
-#: dpkg-split/main.c:104
+#: dpkg-split/main.c:110
 msgid "part size is far too large or is not positive"
 msgstr "veµkos» èasti je buï príli¹ veµká alebo negatívna"
 
-#: 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 "veµkos» èasti musí by» aspoò %dk (kvôli hlavièke)"
@@ -5874,6 +5850,74 @@ msgstr "zdrojov
 msgid "unable to exec mksplit"
 msgstr "nie je mo¾né spusti» funkciu 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 ""
+#~ "Toto je slobodný software; podrobnej¹ie informácie o pravidlách "
+#~ "kopírovania nájdete\n"
+#~ "v GNU General Public Licence verzia 2 alebo neskor¹ej. Záruka sa "
+#~ "neposkytuje.\n"
+#~ "Pozrite "
+
+#~ msgid " --licence for copyright and license details.\n"
+#~ msgstr "--licencia pre copyright a detaily o licencii.\n"
+
+#~ msgid "Debian `"
+#~ msgstr "Debian `"
+
+#~ msgid "Usage: "
+#~ msgstr "Pou¾itie: "
+
+#~ 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 ""
+#~ "Verzia %s.\n"
+#~ "Copyright (C) 1994-1996 Ian Jackson.\n"
+#~ "Copyright (C) 2000,2001 Wichrt Akkerman.\n"
+#~ "Toto je slobodný software; podrobnosti o pravidlách kopírovania\n"
+#~ "nájdete v GNU General Public Licence vo verzii 2 alebo neskor¹ej.  Záruka "
+#~ "sa neposkytuje.\n"
+#~ "Pou¾ite dselect --licence pre viac informácií.\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 ""
+#~ "Pou¾itie: dselect [voµby]\n"
+#~ "          dselect [voµby] akcia ...\n"
+#~ "Options:  --admindir <adresár>  (predvolený je /var/lib/dpkg)\n"
+#~ "          --help  --version  --licence  --expert  --debug <súbor> | -"
+#~ "D<súbor>\n"
+#~ "          --colour screenpart:[foreground],[background][:attr[+attr+..]]\n"
+#~ "Akcie:    prístup aktualizácia výber in¹talácia konfigurácia odstránenie "
+#~ "koniec\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.  Toto je slobodný software; pre\n"
+#~ "podmienky kopírovania pozrite GNU General Public Licence verziu 2 alebo "
+#~ "neskor¹iu.\n"
+#~ "Záruka sa neposkytuje.  Pou¾ite dpkg-split --licence pre získanie "
+#~ "detailov.\n"
+
 #~ msgid "Type md5sum --help for help."
 #~ msgstr "Napí¹te dpkg-split --help pre zobrazenie nápovedy."
 

po/sv.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dpkg 1.13.11.0.1\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: 2005-12-19 19:11+0100\n"
 "Last-Translator: Daniel Nylander <po@danielnylander.se>\n"
 "Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
@@ -2115,90 +2115,89 @@ msgid "failed to exec rm for cleanup"
 msgstr "kunde inte utföra rm för upprensning"
 
 #: 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 "\" pakethanteringsprogram 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 ""
 "Detta program är fri programvara. Se GNU General Public License version 2\n"
 "eller senare för kopieringsvillkor. Det finns INGEN garanti.\n"
-"Se "
-
-#: src/main.c:50 src/query.c:465
-msgid " --licence for copyright and license details.\n"
-msgstr " --license för upphovsrättsliga och licenstekniska detaljer.\n"
+"Se dpkg-deb --licence för detaljer.\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 ""
@@ -2272,14 +2271,15 @@ msgstr ""
 "\n"
 "Använd \"dselect\" eller \"aptitude\" för användarvänlig pakethantering.\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 "
@@ -2296,17 +2296,17 @@ msgstr ""
 "Flaggor markerade med [*] ger mycket utdata - kör genom \"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 "motstridiga val --%s och --%s"
 
-#: src/main.c:189
+#: src/main.c:191
 #, c-format
 msgid "Warning: obsolete option `--%s'\n"
 msgstr "Varning: föråldrad flagga \"--%s\"\n"
 
-#: src/main.c:197
+#: src/main.c:199
 #, c-format
 msgid ""
 "%s debugging option, --debug=<octal> or -D<octal>:\n"
@@ -2343,27 +2343,27 @@ msgstr ""
 "Felsökningsflaggor kombineras med bitvis eller.\n"
 "Notera att betydelser och värden kan komma att ändras.\n"
 
-#: src/main.c:216
+#: src/main.c:218
 msgid "--debug requires an octal argument"
 msgstr "--debug behöver ett oktalt argument"
 
-#: src/main.c:240
+#: src/main.c:242
 #, c-format
 msgid "null package name in --ignore-depends comma-separated list `%.250s'"
 msgstr "tomt paketnamn i --ignore-depends kommaseparerade lista \"%.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 behöver ett giltigt paketnamn. \"%.250s\" är inte det; %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 "ogiltigt heltal för --%s: \"%.250s\""
 
-#: src/main.c:292
+#: src/main.c:294
 #, c-format
 msgid ""
 "%s forcing options - control behaviour when problems found:\n"
@@ -2439,48 +2439,48 @@ msgstr ""
 "installation\n"
 "om de används. Flaggor markerade [*] är förvalda.\n"
 
-#: src/main.c:337
+#: src/main.c:339
 #, c-format
 msgid "unknown force/refuse option `%.*s'"
 msgstr "okänd flagga för force/refuse: \"%.*s\""
 
-#: src/main.c:442 src/main.c:446
+#: src/main.c:444 src/main.c:448
 msgid "couldn't malloc in execbackend"
 msgstr "kunde inte allokera 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 "kunde inte duplicera sträng i execbackend"
 
-#: src/main.c:455
+#: src/main.c:457
 #, c-format
 msgid "failed to exec %s"
 msgstr "kunde inte exekvera %s"
 
-#: src/main.c:467
+#: src/main.c:469
 msgid "--command-fd takes 1 argument, not 0"
 msgstr "--command-fd tar exakt ett argument"
 
-#: src/main.c:468
+#: src/main.c:470
 msgid "--command-fd only takes 1 argument"
 msgstr "--command-fd tar bara ett argument"
 
-#: src/main.c:470
+#: src/main.c:472
 msgid "invalid number for --command-fd"
 msgstr "ogiltigt tal för --command-fd"
 
-#: src/main.c:472
+#: src/main.c:474
 #, c-format
 msgid "couldn't open `%i' for stream"
 msgstr "kunde inte öppna \"%i\" för ström"
 
-#: src/main.c:497
+#: src/main.c:499
 #, c-format
 msgid "unexpected eof before end of line %d"
 msgstr "oväntat filslut före slut på rad %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 "du har inte talat om vad som skall utföras"
 
@@ -2871,46 +2871,31 @@ msgstr ""
 "Använd dpkg --info (= dpkg-deb --info) för att undersöka arkivfiler,\n"
 "och dpkg --contents (= dpkg-deb --contents) för att visa innehållet.\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 "\" frågeverktyg för pakethanteringsprogrammet\n"
 
-#: src/query.c:473
-#, c-format
-msgid "Usage: "
-msgstr "Användning: "
-
-#: 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 ""
 " [<flagga>] <kommando>\n"
 "Kommandon:\n"
@@ -2936,10 +2921,25 @@ msgstr ""
 "  ${var[;bredd]}. Fälten kommer att högerjusteras såvida inte bredden anges\n"
 "  negativt, i vilket fall vänsterjustering kommer användas.\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 ""
 "Använd --help för hjälp om att fråga efter paketinformation;\n"
@@ -3982,105 +3982,99 @@ msgid "menu"
 msgstr "meny"
 
 #: 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\" pakethanteringsskal."
 
 #: 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"
-"Upphovsrättsskyddat © 1994-1996 Ian Jackson.\n"
-"Upphovsrättsskyddat © 2000,2001 Wichert Akkerman.\n"
-"Detta program är fri programvara. Se GNU General Public License version 2\n"
-"eller senare för kopieringsvillkor. Det finns INGEN garanti. Se\n"
-"dselect --license för 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 ""
-"Användning: dselect [flaggor]\n"
-"            dselect [flaggor] handling ...\n"
-"Flaggor: --admindir <katalog>  (förval är /var/lib/dpkg)\n"
-"         --help  --version  --license  --expert  --debug <fil> | -D<fil>\n"
-"         --colour skärmdel:[förgrund],[bakgrund][:attr[+attr+..]]\n"
-"Handlingar: 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ärmdelar:\n"
 
-#: dselect/main.cc:182
+#: dselect/main.cc:192
 #, c-format
 msgid "Colours:\n"
 msgstr "Färger:\n"
 
-#: dselect/main.cc:187
+#: dselect/main.cc:197
 #, c-format
 msgid "Attributes:\n"
 msgstr "Attribut:\n"
 
-#: dselect/main.cc:207
+#: dselect/main.cc:217
 #, c-format
 msgid "couldn't open debug file `%.255s'\n"
 msgstr "kunde inte öppna felsökningsfil \"%.255s\"\n"
 
-#: dselect/main.cc:222
+#: dselect/main.cc:232
 #, c-format
 msgid "Invalid %s `%s'\n"
 msgstr "Ogiltig %s \"%s\"\n"
 
-#: dselect/main.cc:239
+#: dselect/main.cc:249
 msgid "screen part"
 msgstr "skärmdel"
 
-#: dselect/main.cc:245
+#: dselect/main.cc:255
 msgid "Null colour specification\n"
 msgstr "Tom färgangivelse\n"
 
-#: dselect/main.cc:253 dselect/main.cc:258
+#: dselect/main.cc:263 dselect/main.cc:268
 msgid "colour"
 msgstr "färg"
 
-#: dselect/main.cc:266
+#: dselect/main.cc:276
 msgid "colour attribute"
 msgstr "färgattribut"
 
-#: dselect/main.cc:300
+#: dselect/main.cc:310
 msgid "Terminal does not appear to support cursor addressing.\n"
 msgstr "Terminalen verkar inte tillåta marköradressering.\n"
 
-#: dselect/main.cc:302
+#: dselect/main.cc:312
 msgid "Terminal does not appear to support highlighting.\n"
 msgstr "Terminalen verkar inte tillåta ljusmarkering.\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 ""
 "Korrigera din TERM-variabel, använd en bättre terminal eller\n"
 "lev med det per-pakethanterande verktyget "
 
-#: dselect/main.cc:306
+#: dselect/main.cc:317
 msgid "terminal lacks necessary features, giving up"
 msgstr "terminalen saknar funktioner som behövs, ger upp"
 
-#: dselect/main.cc:384
+#: dselect/main.cc:395
 msgid ""
 "\n"
 "\n"
@@ -4093,7 +4087,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:398
+#: dselect/main.cc:410
 msgid ""
 "\n"
 "\n"
@@ -4103,11 +4097,11 @@ msgstr ""
 "\n"
 "Skrivskyddat läge: du kan bara titta på innehållet!"
 
-#: dselect/main.cc:417
+#: dselect/main.cc:429
 msgid "failed to getch in main menu"
 msgstr "kunde inte läsa tecken i huvudmenyn"
 
-#: dselect/main.cc:490
+#: dselect/main.cc:502
 #, c-format
 msgid "unknown action string `%.50s'"
 msgstr "okänd handling \"%.50s\""
@@ -5334,62 +5328,44 @@ msgstr "Fel i format"
 msgid "--contents takes exactly one argument"
 msgstr "--contents tar endast ett argument"
 
-#: 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 "\" paketarkiveringsprogram 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 ""
-"Detta program är fri programvara. Se GNU General Public License version 2\n"
-"eller senare för kopieringsvillkor. Det finns INGEN garanti.\n"
-"Se dpkg-deb --licence för detaljer.\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 <katalog> [<deb>]    Bygg ett arkiv.\n"
@@ -5437,7 +5413,16 @@ msgstr ""
 "packats\n"
 "upp med \"dpkg-deb --extract\" kommer inte att installeras korrekt!\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."
@@ -5445,7 +5430,7 @@ msgstr ""
 "Skriv dpkg-deb --help för hjälp om att hantera *.deb-filer\n"
 "Skriv dpkg --help för hjälp om att installera och avinstallera paket."
 
-#: dpkg-deb/main.c:176
+#: dpkg-deb/main.c:181
 #, c-format
 msgid "unknown compression type `%s'!"
 msgstr "okänd komprimeringstyp \"%s\"."
@@ -5609,43 +5594,41 @@ msgstr "--join kr
 msgid "part %d is missing"
 msgstr "fel %d saknas"
 
-#: 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\" verktyg för delning/sammanslagning, 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 ""
-"Upphovsrättsskyddat © 1994-1996 Ian Jackson. Detta program är fri "
-"programvara.\n"
-"Se GNU General Public License version 2 eller senare för kopieringsvillkor.\n"
-"Det finns INGEN garanti. Se dpkg-split --license för detaljer.\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 ""
@@ -5667,30 +5650,30 @@ msgstr ""
 "\n"
 "Felstatus: 0 = OK, 1 = -a är inte en del, 2 = problem!\n"
 
-#: dpkg-split/main.c:69
+#: dpkg-split/main.c:75
 msgid "Type dpkg-split --help for help."
 msgstr "Skriv dpkg-split --help för hjälp."
 
-#: dpkg-split/main.c:79
+#: dpkg-split/main.c:85
 #, c-format
 msgid "error reading %s"
 msgstr "fel vid läsning av %s"
 
-#: dpkg-split/main.c:83
+#: dpkg-split/main.c:89
 #, c-format
 msgid "error reading %.250s"
 msgstr "fel vid läsning av %.250s"
 
-#: dpkg-split/main.c:84
+#: dpkg-split/main.c:90
 #, c-format
 msgid "unexpected end of file in %.250s"
 msgstr "oväntat filslut i %.250s"
 
-#: dpkg-split/main.c:104
+#: dpkg-split/main.c:110
 msgid "part size is far too large or is not positive"
 msgstr "delstorlek är för stor eller ej 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 "delstorleken måste vara minst %dk (för att tillåta huvud)"
@@ -5825,6 +5808,71 @@ msgstr "k
 msgid "unable to exec mksplit"
 msgstr "kunde inte exekvera 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 ""
+#~ "Detta program är fri programvara. Se GNU General Public License version "
+#~ "2\n"
+#~ "eller senare för kopieringsvillkor. Det finns INGEN garanti.\n"
+#~ "Se "
+
+#~ msgid " --licence for copyright and license details.\n"
+#~ msgstr " --license för upphovsrättsliga och licenstekniska detaljer.\n"
+
+#~ msgid "Debian `"
+#~ msgstr "Debian \""
+
+#~ msgid "Usage: "
+#~ msgstr "Användning: "
+
+#~ 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"
+#~ "Upphovsrättsskyddat © 1994-1996 Ian Jackson.\n"
+#~ "Upphovsrättsskyddat © 2000,2001 Wichert Akkerman.\n"
+#~ "Detta program är fri programvara. Se GNU General Public License version "
+#~ "2\n"
+#~ "eller senare för kopieringsvillkor. Det finns INGEN garanti. Se\n"
+#~ "dselect --license för 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 ""
+#~ "Användning: dselect [flaggor]\n"
+#~ "            dselect [flaggor] handling ...\n"
+#~ "Flaggor: --admindir <katalog>  (förval är /var/lib/dpkg)\n"
+#~ "         --help  --version  --license  --expert  --debug <fil> | -D<fil>\n"
+#~ "         --colour skärmdel:[förgrund],[bakgrund][:attr[+attr+..]]\n"
+#~ "Handlingar: 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 ""
+#~ "Upphovsrättsskyddat © 1994-1996 Ian Jackson. Detta program är fri "
+#~ "programvara.\n"
+#~ "Se GNU General Public License version 2 eller senare för "
+#~ "kopieringsvillkor.\n"
+#~ "Det finns INGEN garanti. Se dpkg-split --license för detaljer.\n"
+
 #~ msgid "Type md5sum --help for help."
 #~ msgstr "Skriv md5sum --help för hjälp."
 

po/tl.po

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dpkg 1.13\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: 2005-11-03 15:11+0800\n"
 "Last-Translator: Eric Pareja <xenos@upm.edu.ph>\n"
 "Language-Team: Tagalog <debian-tl@banwa.upm.edu.ph>\n"
@@ -2152,92 +2152,90 @@ msgid "failed to exec rm for cleanup"
 msgstr "bigo sa pag-exec ng rm para sa paglinis"
 
 #: 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 "' programang tagapangasiwa ng mga pakete, bersyon "
 
-#: 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 ""
-"Ito ay malayang software; basahin ang Pangmadlang Lisensiya ng GNU, bersyon "
-"2\n"
-"(GNU General Public Licence version 2) o mas bago para sa kundisyones ng\n"
-"pag-kopya. WALANG WARANTI.\n"
-"Basahin "
-
-#: src/main.c:50 src/query.c:465
-msgid " --licence for copyright and license details.\n"
-msgstr " --licence para sa karapatang-sipi at detalye ng lisensya.\n"
+"Ito ay malayang software; basahin ang GNU General Public Licence bersyon 2 "
+"o\n"
+"mas-bago para sa kundisyon ng pangongopya. Walang waranti.\n"
+"Basahin ang dpkg-deb --licence para sa detalye.\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 ""
@@ -2340,14 +2338,15 @@ msgstr ""
 "Gamitin ang `dselect' o `aptitude' para sa mas-madaling tagapangasiwa ng "
 "pakete\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 "
@@ -2365,17 +2364,17 @@ msgstr ""
 "Mga opsyon na may markang [*] ay nagpapakita ng maraming output - i-pipe ito "
 "sa `less' o `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 "magkatunggaling gagawin --%s at --%s"
 
-#: src/main.c:189
+#: src/main.c:191
 #, c-format
 msgid "Warning: obsolete option `--%s'\n"
 msgstr "Babala: laos na opsyon `--%s'\n"
 
-#: src/main.c:197
+#: src/main.c:199
 #, c-format
 msgid ""
 "%s debugging option, --debug=<octal> or -D<octal>:\n"
@@ -2412,30 +2411,30 @@ msgstr ""
 "Opsyon sa pag-debug ay pinagsasama gamit ang bitwise-or.\n"
 "Unawain na ang mga kahulugan at halaga ay maaaring magbago.\n"
 
-#: src/main.c:216
+#: src/main.c:218
 msgid "--debug requires an octal argument"
 msgstr "--debug ay nangangailangan ng argumentong octal"
 
-#: src/main.c:240
+#: src/main.c:242
 #, c-format
 msgid "null package name in --ignore-depends comma-separated list `%.250s'"
 msgstr ""
 "pangalan ng pakete na null sa --ignore-depends listahang hiwalay-ng-koma `"
 "%.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 ay nangangailangan ng legal na pangalan ng pakete. `%.250s' "
 "ay hindi: %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 "di tanggap na integer para sa --%s: `%.250s'"
 
-#: src/main.c:292
+#: src/main.c:294
 #, c-format
 msgid ""
 "%s forcing options - control behaviour when problems found:\n"
@@ -2527,48 +2526,48 @@ msgstr ""
 "ay\n"
 "naka-enable na default.\n"
 
-#: src/main.c:337
+#: src/main.c:339
 #, c-format
 msgid "unknown force/refuse option `%.*s'"
 msgstr "di kilalang opsyon na force/refuse `%.*s'"
 
-#: src/main.c:442 src/main.c:446
+#: src/main.c:444 src/main.c:448
 msgid "couldn't malloc in execbackend"
 msgstr "hindi maka-malloc sa execbackend"
 
-#: src/main.c:444 src/main.c:451
+#: src/main.c:446 src/main.c:453
 msgid "couldn't strdup in execbackend"
 msgstr "hindi maka-strdup sa execbackend"
 
-#: src/main.c:455
+#: src/main.c:457
 #, c-format
 msgid "failed to exec %s"
 msgstr "bigo sa pag-exec ng %s"
 
-#: src/main.c:467
+#: src/main.c:469
 msgid "--command-fd takes 1 argument, not 0"
 msgstr "--command-fd ay tumatanggap ng 1 argumento, hindi 0"
 
-#: src/main.c:468
+#: src/main.c:470
 msgid "--command-fd only takes 1 argument"
 msgstr "--command-fd ay tumatanggap lamang ng 1 argumento"
 
-#: src/main.c:470
+#: src/main.c:472
 msgid "invalid number for --command-fd"
 msgstr "di tanggap na numero para sa --command-fd"
 
-#: src/main.c:472
+#: src/main.c:474
 #, c-format
 msgid "couldn't open `%i' for stream"
 msgstr "hindi mabuksan ang `%i' para sa stream"
 
-#: src/main.c:497
+#: src/main.c:499
 #, c-format
 msgid "unexpected eof before end of line %d"
 msgstr "di inaasahang eof bago matapos ang linya %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 "kailangan ng opsyon ng gagawin"
 
@@ -2966,46 +2965,31 @@ msgstr ""
 "Gamitin dpkg --info (= dpkg-deb --info) upang tignan ang talksang arkibo,\n"
 "at dpkg --contents (= dpkg-deb --contents) upang ilista ang nilalaman nila.\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 " kasangkapan sa pagtanong ng programang tagapangasiwa ng mga pakete\n"
 
-#: src/query.c:473
-#, c-format
-msgid "Usage: "
-msgstr "Pag-gamit: "
-
-#: 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 ""
 " [<opsyon>] <utos>\n"
 "Mga utos:\n"
@@ -3043,10 +3027,25 @@ msgstr ""
 "  maliban kung negatibo ang lapad at kung ganoon ay ayos-pakaliwa ang "
 "gagamitin.\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 ""
 "Gamitin --help para sa tulong tungkol sa pagtanong ukol sa mga pakete;\n"
@@ -4138,107 +4137,100 @@ 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' mukha ng tagapangasiwa ng mga pakete."
 
 #: 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 ""
-"Bersyon %s.\n"
-"Copyright (C) 1994-1996 Ian Jackson.\n"
-"Copyright (C) 2000,2001 Wichert Akkerman.\n"
-"Ito ay malayang software; basahin ang GNU General Public Licence bersyon 2\n"
-"o mas-bago para sa kundisyon ng pangongopya.  WALANG waranti. Basahin\n"
-"dselect --licence para sa mga detalye.\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 ""
-"Pag-gamit: dselect [mga opsyon]\n"
-"           dselect [mga opsyon] aksyon ...\n"
-"Mga opsyon:  --admindir <directory> (ang default ay /var/lib/dpkg)\n"
-"     --help  --version  --licence  --expert  --debug <talaksan> | -"
-"D<talaksan>\n"
-"     --colour bahagingtabing:[foreground],[background][:attr[+attr+..]]\n"
-"Mga aksyon:  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 "Bahagingtabing:\n"
 
-#: dselect/main.cc:182
+#: dselect/main.cc:192
 #, c-format
 msgid "Colours:\n"
 msgstr "Colours/Mga kulay:\n"
 
-#: dselect/main.cc:187
+#: dselect/main.cc:197
 #, c-format
 msgid "Attributes:\n"
 msgstr "Mga attribute:\n"
 
-#: dselect/main.cc:207
+#: dselect/main.cc:217
 #, c-format
 msgid "couldn't open debug file `%.255s'\n"
 msgstr "hindi mabuksan ang talaksang pan-debug `%.255s'\n"
 
-#: dselect/main.cc:222
+#: dselect/main.cc:232
 #, c-format
 msgid "Invalid %s `%s'\n"
 msgstr "Di tanggap na %s `%s'\n"
 
-#: dselect/main.cc:239
+#: dselect/main.cc:249
 msgid "screen part"
 msgstr "bahagi ng tabing"
 
-#: dselect/main.cc:245
+#: dselect/main.cc:255
 msgid "Null colour specification\n"
 msgstr "Null na spesipikasyong pangkulay\n"
 
-#: dselect/main.cc:253 dselect/main.cc:258
+#: dselect/main.cc:263 dselect/main.cc:268
 msgid "colour"
 msgstr "kulay"
 
-#: dselect/main.cc:266
+#: dselect/main.cc:276
 msgid "colour attribute"
 msgstr "attribute ng kulay"
 
-#: dselect/main.cc:300
+#: dselect/main.cc:310
 msgid "Terminal does not appear to support cursor addressing.\n"
 msgstr "Mukhang ang himpilan ay hindi sumusuporta ng cursor addressing.\n"
 
-#: dselect/main.cc:302
+#: dselect/main.cc:312
 msgid "Terminal does not appear to support highlighting.\n"
 msgstr "Mukhang ang himpilan ay hindi sumusuporta ng highlighting.\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 ""
 "Itakda ang inyong TERM variable ng wasto, gumamit ng mas mahusay na "
 "himpilan,\n"
 "o kayanin na lamang na gamit ang kasangkapang tagapangasiwa ng bawat pakete "
 
-#: dselect/main.cc:306
+#: dselect/main.cc:317
 msgid "terminal lacks necessary features, giving up"
 msgstr "kulang ng kailangan na mga feature ang terminal, sumusuko na"
 
-#: dselect/main.cc:384
+#: dselect/main.cc:395
 msgid ""
 "\n"
 "\n"
@@ -4254,7 +4246,7 @@ msgstr ""
 "tabing.\n"
 "\n"
 
-#: dselect/main.cc:398
+#: dselect/main.cc:410
 msgid ""
 "\n"
 "\n"
@@ -4264,11 +4256,11 @@ msgstr ""
 "\n"
 "Pagbasa-lamang na akses: matitignan lamang ang magagamit na mga pagpipilian!"
 
-#: dselect/main.cc:417
+#: dselect/main.cc:429
 msgid "failed to getch in main menu"
 msgstr "bigo ang getch sa pangunahing menu"
 
-#: dselect/main.cc:490
+#: dselect/main.cc:502
 #, c-format
 msgid "unknown action string `%.50s'"
 msgstr "di kilalang action string `%.50s'"
@@ -5509,63 +5501,44 @@ msgstr "Error sa format"
 msgid "--contents takes exactly one argument"
 msgstr "--contents ay tumatanggap ng isang argumento lamang"
 
-#: 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 "' bersyon ng backend ng arkibong pakete"
 
-#: dpkg-deb/main.c:50
+#: dpkg-deb/main.c:56
+#, 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 dpkg-deb --licence for details.\n"
-msgstr ""
-"Ito ay malayang software; basahin ang GNU General Public Licence bersyon 2 "
-"o\n"
-"mas-bago para sa kundisyon ng pangongopya. Walang waranti.\n"
-"Basahin ang dpkg-deb --licence para sa detalye.\n"
-
-#: dpkg-deb/main.c:58
-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"
-"\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"
+"  -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"
-"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 ""
 "Mga utos:\n"
 "  -b|--build <directory> [<deb>]    bumuo ng arkibo.\n"
@@ -5614,7 +5587,16 @@ msgstr ""
 "binuklat\n"
 "gamit ang `dpkg-deb --extract' ay hindi maluluklok ng tama !\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."
@@ -5622,7 +5604,7 @@ msgstr ""
 "dpkg-deb --help para sa tulong tungkol sa pag-manipulate ng *.deb;\n"
 "dpkg --help para sa tulong tungkol sa pagluklok at pagtanggal ng mga pakete."
 
-#: dpkg-deb/main.c:176
+#: dpkg-deb/main.c:181
 #, c-format
 msgid "unknown compression type `%s'!"
 msgstr "di kilalang uri ng compression `%s'!"
@@ -5799,47 +5781,43 @@ msgstr ""
 msgid "part %d is missing"
 msgstr "bahaging %d ay nawawala"
 
-#: 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' kasangkapang panghati/pandugtong ng mga "
 "pakete;\n"
 "bersyon "
 
-#: 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 ""
-"Karapatang-sipi (C) 1994-1996 ni Ian Jackson.  Ito ay malayang software; "
-"tignan\n"
-"ang Pangkalahatang Lisensiyang Pampubliko ng GNU bersyon 2 o masbago para "
-"sa\n"
-"kundisyones ng pangongopya. Walang waranti. Tignan ang dpkg-split --licence\n"
-"para sa detalye.\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 ""
@@ -5874,30 +5852,30 @@ msgstr ""
 "\n"
 "Kalagayan paglabas: 0 = OK;  1 = -a ay hindi bahagi; 2 = bagabag!\n"
 
-#: dpkg-split/main.c:69
+#: dpkg-split/main.c:75
 msgid "Type dpkg-split --help for help."
 msgstr "dpkg-split --help para sa tulong."
 
-#: dpkg-split/main.c:79
+#: dpkg-split/main.c:85
 #, c-format
 msgid "error reading %s"
 msgstr "error sa pagbasa ng %s"
 
-#: dpkg-split/main.c:83
+#: dpkg-split/main.c:89
 #, c-format
 msgid "error reading %.250s"
 msgstr "error sa pagbasa ng %.250s"
 
-#: dpkg-split/main.c:84
+#: dpkg-split/main.c:90
 #, c-format
 msgid "unexpected end of file in %.250s"
 msgstr "di inaasahang dulo ng talaksan sa %.250s"
 
-#: dpkg-split/main.c:104
+#: dpkg-split/main.c:110
 msgid "part size is far too large or is not positive"
 msgstr "laki ng bahagi ay labis ng laki o hindi positibo"
 
-#: 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 "laki ng bahagi ay dapat hindi kumulang sa %dk (kasama na ang header)"
@@ -6037,6 +6015,75 @@ msgstr "pinagmulan na talaksan `%.250s' ay hindi payak na talaksan"
 msgid "unable to exec mksplit"
 msgstr "hindi ma-exec ang 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 ""
+#~ "Ito ay malayang software; basahin ang Pangmadlang Lisensiya ng GNU, "
+#~ "bersyon 2\n"
+#~ "(GNU General Public Licence version 2) o mas bago para sa kundisyones ng\n"
+#~ "pag-kopya. WALANG WARANTI.\n"
+#~ "Basahin "
+
+#~ msgid " --licence for copyright and license details.\n"
+#~ msgstr " --licence para sa karapatang-sipi at detalye ng lisensya.\n"
+
+#~ msgid "Debian `"
+#~ msgstr "Debian `"
+
+#~ msgid "Usage: "
+#~ msgstr "Pag-gamit: "
+
+#~ 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 ""
+#~ "Bersyon %s.\n"
+#~ "Copyright (C) 1994-1996 Ian Jackson.\n"
+#~ "Copyright (C) 2000,2001 Wichert Akkerman.\n"
+#~ "Ito ay malayang software; basahin ang GNU General Public Licence bersyon "
+#~ "2\n"
+#~ "o mas-bago para sa kundisyon ng pangongopya.  WALANG waranti. Basahin\n"
+#~ "dselect --licence para sa mga detalye.\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 ""
+#~ "Pag-gamit: dselect [mga opsyon]\n"
+#~ "           dselect [mga opsyon] aksyon ...\n"
+#~ "Mga opsyon:  --admindir <directory> (ang default ay /var/lib/dpkg)\n"
+#~ "     --help  --version  --licence  --expert  --debug <talaksan> | -"
+#~ "D<talaksan>\n"
+#~ "     --colour bahagingtabing:[foreground],[background][:attr[+attr+..]]\n"
+#~ "Mga aksyon:  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 ""
+#~ "Karapatang-sipi (C) 1994-1996 ni Ian Jackson.  Ito ay malayang software; "
+#~ "tignan\n"
+#~ "ang Pangkalahatang Lisensiyang Pampubliko ng GNU bersyon 2 o masbago para "
+#~ "sa\n"
+#~ "kundisyones ng pangongopya. Walang waranti. Tignan ang dpkg-split --"
+#~ "licence\n"
+#~ "para sa detalye.\n"
+
 #~ msgid ""
 #~ "dpkg: unexpected output from `%s --print-libgcc-file-name':\n"
 #~ " `%s'\n"

po/zh_CN.po

@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dpkg 1.13\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: 2005-10-23 22:28+0800\n"
 "Last-Translator: Tchaikov <tchaikov@sjtu.edu.cn>\n"
 "Language-Team: Debian Chinese [GB] <debian-chinese-gb@lists.debian.org>\n"
@@ -2080,90 +2080,89 @@ msgid "failed to exec rm for cleanup"
 msgstr "无法使用 exec rm 来清理现场"
 
 #: 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 "”软件包管理程序，版本 "
 
-#: 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 ""
 "这是自由软件；要获知复制该软件的前提和条件，请参阅 GNU 公共许可证的\n"
 "第二版或其更新的版本。该软件【不】提供任何担保。\n"
-"请通过执行 "
-
-#: src/main.c:50 src/query.c:465
-msgid " --licence for copyright and license details.\n"
-msgstr " --licence 来查看版权和许可证的细节。\n"
+"请通过执行 dpkg-deb --licence 来查看版权和许可证的细节。\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 ""
@@ -2235,14 +2234,15 @@ msgstr ""
 "\n"
 "“dselect”提供了更为易用的的软件包管理工具。\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 "
@@ -2257,17 +2257,17 @@ msgstr ""
 "带有[*]的选项将会输出较大篇幅的文字 - 可使用管道将其输出连接"
 "到“less”或“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 "操作之间有矛盾 -- %s 和 -- %s"
 
-#: src/main.c:189
+#: src/main.c:191
 #, c-format
 msgid "Warning: obsolete option `--%s'\n"
 msgstr "警告：已废弃不用的选项“--%s”\n"
 
-#: src/main.c:197
+#: src/main.c:199
 #, c-format
 msgid ""
 "%s debugging option, --debug=<octal> or -D<octal>:\n"
@@ -2304,27 +2304,27 @@ msgstr ""
 "可以用位与(bitwise-or)把除错选项组合起来使用。\n"
 "注意，意义和数值将有可能更动。\n"
 
-#: src/main.c:216
+#: src/main.c:218
 msgid "--debug requires an octal argument"
 msgstr "--debug 需要一个八进制的参数"
 
-#: src/main.c:240
+#: src/main.c:242
 #, c-format
 msgid "null package name in --ignore-depends comma-separated list `%.250s'"
 msgstr ""
 "在 --ignore-depends 的用逗号相隔的参数列表“%s”中，发现有的软件包名是空的"
 
-#: 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 需要一个有效的软件包名。而“%.250s”却不是；%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 "--%s 有一个无效的数字参数：“%.250s”"
 
-#: src/main.c:292
+#: src/main.c:294
 #, c-format
 msgid ""
 "%s forcing options - control behaviour when problems found:\n"
@@ -2398,48 +2398,48 @@ msgstr ""
 "警告 - 使用带有[!]标记的选项可能会严重破坏您的系统安装。\n"
 "缺省情况下，是使用带有[*]标记的强制手段的。\n"
 
-#: src/main.c:337
+#: src/main.c:339
 #, c-format
 msgid "unknown force/refuse option `%.*s'"
 msgstr "无法识别的 force/refuse 选项“%.*s”"
 
-#: src/main.c:442 src/main.c:446
+#: src/main.c:444 src/main.c:448
 msgid "couldn't malloc in execbackend"
 msgstr "无法在 execbackend 中 malloc"
 
-#: src/main.c:444 src/main.c:451
+#: src/main.c:446 src/main.c:453
 msgid "couldn't strdup in execbackend"
 msgstr "无法在 execbackend 中 strdup"
 
-#: src/main.c:455
+#: src/main.c:457
 #, c-format
 msgid "failed to exec %s"
 msgstr "exec %s 失败"
 
-#: src/main.c:467
+#: src/main.c:469
 msgid "--command-fd takes 1 argument, not 0"
 msgstr "--command-fd 需要带一个参数，而不是零个"
 
-#: src/main.c:468
+#: src/main.c:470
 msgid "--command-fd only takes 1 argument"
 msgstr "--command-fd 只需带一个参数"
 
-#: src/main.c:470
+#: src/main.c:472
 msgid "invalid number for --command-fd"
 msgstr "--command-fd 有一个无效的数字参数"
 
-#: src/main.c:472
+#: src/main.c:474
 #, c-format
 msgid "couldn't open `%i' for stream"
 msgstr "无法打开“%i”，并把它作为字符流操作"
 
-#: src/main.c:497
+#: src/main.c:499
 #, c-format
 msgid "unexpected eof before end of line %d"
 msgstr "在第 %d 行还未结束时，发现了预料之外的 eof"
 
-#: 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 "需要一个指示操作的选项"
 
@@ -2822,46 +2822,31 @@ msgstr ""
 "使用 dpkg --info (= dpkg-deb --info) 来检测打包好的文件，\n"
 "还可以用过 dpkg --contents (= dpkg-deb --contents) 来列出它们的内容。\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 "”软件包管理程序查询工具\n"
 
-#: src/query.c:473
-#, c-format
-msgid "Usage: "
-msgstr "用法："
-
-#: 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 ""
 " [<选项>] <命令>\n"
 "命令：\n"
@@ -2887,10 +2872,25 @@ msgstr ""
 "  字段一般是靠右对齐的，除非它的宽度是负数。若其宽度是负数，\n"
 "  那么字段将会靠左对齐。\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 ""
 "使用 --help 可获得软件包查询方面的帮助；\n"
@@ -3899,106 +3899,99 @@ msgid "menu"
 msgstr "菜单"
 
 #: 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” 软件包操作前端"
 
 #: 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 ""
-"版本 %s。\n"
-"版权所有(C) 1994-1996 Ian Jackson。\n"
-"版权所有(C) 2000,2001 Wichert Akkerman。\n"
-"这是自由软件；要获知复制该软件的前提和条件，请参阅 GNU 公共许可证的\n"
-"第二版或其更新的版本。该软件【不】提供任何担保。请通过执行\n"
-"dselect --licence 查看详细的说明。\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"
+"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 [选项]\n"
-"      dselect [选项] 操作 ...\n"
-"选项： --admindir <目录名>  (缺省值是 /var/lib/dpkg)\n"
-"       --help  --version  --licence  --expert  --debug <文件名> | -D<文件名"
-">\n"
-"       --colour screenpart:[前景色],[背景色][:属性[+属性+..]]\n"
-"操作： access update select install config remove quit\n"
 
-#: dselect/main.cc:177
+#: dselect/main.cc:187
 #, c-format
 msgid "Screenparts:\n"
 msgstr "显示部位：\n"
 
-#: dselect/main.cc:182
+#: dselect/main.cc:192
 #, c-format
 msgid "Colours:\n"
 msgstr "颜色：\n"
 
-#: dselect/main.cc:187
+#: dselect/main.cc:197
 #, c-format
 msgid "Attributes:\n"
 msgstr "属性：\n"
 
-#: dselect/main.cc:207
+#: dselect/main.cc:217
 #, c-format
 msgid "couldn't open debug file `%.255s'\n"
 msgstr "无法打开调试信息文件“%.255s”\n"
 
-#: dselect/main.cc:222
+#: dselect/main.cc:232
 #, c-format
 msgid "Invalid %s `%s'\n"
 msgstr "无效的 %s “%s”\n"
 
-#: dselect/main.cc:239
+#: dselect/main.cc:249
 msgid "screen part"
 msgstr "显示部分"
 
-#: dselect/main.cc:245
+#: dselect/main.cc:255
 msgid "Null colour specification\n"
 msgstr "未指定颜色\n"
 
-#: dselect/main.cc:253 dselect/main.cc:258
+#: dselect/main.cc:263 dselect/main.cc:268
 msgid "colour"
 msgstr "颜色"
 
-#: dselect/main.cc:266
+#: dselect/main.cc:276
 msgid "colour attribute"
 msgstr "颜色属性"
 
-#: dselect/main.cc:300
+#: dselect/main.cc:310
 msgid "Terminal does not appear to support cursor addressing.\n"
 msgstr "终端不支持游标的定位。\n"
 
-#: dselect/main.cc:302
+#: dselect/main.cc:312
 msgid "Terminal does not appear to support highlighting.\n"
 msgstr "终端不支持高亮显示。\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 ""
 "请正确设置您的 TERM 变量，用一个更合适的终端类型，\n"
 "或者转用针对单个软件包的包管理工具，即 "
 
-#: dselect/main.cc:306
+#: dselect/main.cc:317
 msgid "terminal lacks necessary features, giving up"
 msgstr "由于终端缺乏必要的特性，只得中止操作"
 
-#: dselect/main.cc:384
+#: dselect/main.cc:395
 msgid ""
 "\n"
 "\n"
@@ -4012,7 +4005,7 @@ msgstr ""
 "摁 <回车> 来确认。  用 ^L 来刷屏。\n"
 "\n"
 
-#: dselect/main.cc:398
+#: dselect/main.cc:410
 msgid ""
 "\n"
 "\n"
@@ -4022,11 +4015,11 @@ msgstr ""
 "\n"
 "只读访问：仅仅可以查看被选中的项目！"
 
-#: dselect/main.cc:417
+#: dselect/main.cc:429
 msgid "failed to getch in main menu"
 msgstr "在主菜单界面中 getch 失败"
 
-#: dselect/main.cc:490
+#: dselect/main.cc:502
 #, c-format
 msgid "unknown action string `%.50s'"
 msgstr "不能识别的操作字串“%.50s”"
@@ -5241,62 +5234,44 @@ msgstr "格式有误"
 msgid "--contents takes exactly one argument"
 msgstr "--contents 需要且仅需一个参数"
 
-#: 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 "”软件包后端的打包程序版本，版本为"
 
-#: 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 ""
-"这是自由软件；要获知复制该软件的前提和条件，请参阅 GNU 公共许可证的\n"
-"第二版或其更新的版本。该软件【不】提供任何担保。\n"
-"请通过执行 dpkg-deb --licence 来查看版权和许可证的细节。\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"
-"\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"
+"  -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"
-"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 ""
 "命令：\n"
 "  -b|--build <目录> [<deb>]         新建一个包文件。\n"
@@ -5337,7 +5312,16 @@ msgstr ""
 "则用于简便的软件包管理。另外，通过“dpkg-deb --extract”命令\n"
 "解压的软件包将不会被正确的安装！\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."
@@ -5345,7 +5329,7 @@ msgstr ""
 "输入 dpkg-deb --help 可获得有关操作 *.deb 文件的帮助；\n"
 "输入 dpkg --help 可获得有关安装和卸载软件包的帮助。"
 
-#: dpkg-deb/main.c:176
+#: dpkg-deb/main.c:181
 #, c-format
 msgid "unknown compression type `%s'!"
 msgstr "无法识别的压缩类型“%s”！"
@@ -5507,41 +5491,40 @@ msgstr "--join 选项需要一个或多个分块文件的文件名作为参数"
 msgid "part %d is missing"
 msgstr "缺少第 %d 个分块"
 
-#: 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”；版本为"
 
-#: 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 ""
-"版权所有 (C) 1994-1996 Ian Jackson。这是自由软件；要获知复制该\n"
-"软件的前提和条件，请参阅 GNU 公共许可证的第二版或其更新的版本。\n"
-"该软件【不】提供任何担保。请执行 dpkg-split --licence 以查看详细的说明。\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 ""
@@ -5563,30 +5546,30 @@ msgstr ""
 "\n"
 "返回码: 0 = OK;  1 = -a 不是一个分块;  2 = 出问题啦！\n"
 
-#: dpkg-split/main.c:69
+#: dpkg-split/main.c:75
 msgid "Type dpkg-split --help for help."
 msgstr "输入 dpkg-split --help 就可以阅读帮助信息。"
 
-#: dpkg-split/main.c:79
+#: dpkg-split/main.c:85
 #, c-format
 msgid "error reading %s"
 msgstr "读取 %s 时出错"
 
-#: dpkg-split/main.c:83
+#: dpkg-split/main.c:89
 #, c-format
 msgid "error reading %.250s"
 msgstr "读取 %.250s 时出错"
 
-#: dpkg-split/main.c:84
+#: dpkg-split/main.c:90
 #, c-format
 msgid "unexpected end of file in %.250s"
 msgstr "在 %.250s 中发现未预期的文件结束符"
 
-#: dpkg-split/main.c:104
+#: dpkg-split/main.c:110
 msgid "part size is far too large or is not positive"
 msgstr "分块文件的大小已远远超长或者不是正数"
 
-#: 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 "分块文件的大小至少必须大于 %dk (为了容下文件头)"
@@ -5721,6 +5704,68 @@ msgstr "原始文件“%.250s”不是普通文件"
 msgid "unable to exec mksplit"
 msgstr "无法 exec 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 ""
+#~ "这是自由软件；要获知复制该软件的前提和条件，请参阅 GNU 公共许可证的\n"
+#~ "第二版或其更新的版本。该软件【不】提供任何担保。\n"
+#~ "请通过执行 "
+
+#~ msgid " --licence for copyright and license details.\n"
+#~ msgstr " --licence 来查看版权和许可证的细节。\n"
+
+#~ msgid "Debian `"
+#~ msgstr "Debian “"
+
+#~ msgid "Usage: "
+#~ msgstr "用法："
+
+#~ 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 ""
+#~ "版本 %s。\n"
+#~ "版权所有(C) 1994-1996 Ian Jackson。\n"
+#~ "版权所有(C) 2000,2001 Wichert Akkerman。\n"
+#~ "这是自由软件；要获知复制该软件的前提和条件，请参阅 GNU 公共许可证的\n"
+#~ "第二版或其更新的版本。该软件【不】提供任何担保。请通过执行\n"
+#~ "dselect --licence 查看详细的说明。\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 ""
+#~ "用法：dselect [选项]\n"
+#~ "      dselect [选项] 操作 ...\n"
+#~ "选项： --admindir <目录名>  (缺省值是 /var/lib/dpkg)\n"
+#~ "       --help  --version  --licence  --expert  --debug <文件名> | -D<文件"
+#~ "名>\n"
+#~ "       --colour screenpart:[前景色],[背景色][:属性[+属性+..]]\n"
+#~ "操作： 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 ""
+#~ "版权所有 (C) 1994-1996 Ian Jackson。这是自由软件；要获知复制该\n"
+#~ "软件的前提和条件，请参阅 GNU 公共许可证的第二版或其更新的版本。\n"
+#~ "该软件【不】提供任何担保。请执行 dpkg-split --licence 以查看详细的说明。\n"
+
 #~ msgid "Type md5sum --help for help."
 #~ msgstr "输入 md5sum --help 就可以阅读帮助信息。"
 

po/zh_TW.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dpkg 1.13\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: 2005-02-05 19:54+0800\n"
 "Last-Translator: Asho Yeh <asho@debian.org.tw>\n"
 "Language-Team: Chinese (traditional) <zh-l10n@linux.org.tw>\n"
@@ -2077,90 +2077,89 @@ msgid "failed to exec rm for cleanup"
 msgstr "無法使用 exec rm 來清除"
 
 #: 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 "”套件管理程式版本 "
 
-#: 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 ""
-"這是自由軟體﹔要取得複製該軟體的前提和條件，請參閱 GNU 公共許可証的\n"
-"第二版或其更新的版本。該軟體【不】提供任何擔保。\n"
-"請通過執行 "
-
-#: src/main.c:50 src/query.c:465
-msgid " --licence for copyright and license details.\n"
-msgstr " --licence 來查看版權和許可証的細節。\n"
+"這是自由軟體﹔要獲知復制該軟體的前提和條件，請參閱 GNU Public Licence \n"
+"第二或更新的版本。該軟體【不】提供任何擔保。\n"
+"請通過執行 dpkg-deb --licence 來查看版權和許可証的細節。\n"
 
-#: src/main.c:58
+#: 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 ""
@@ -2226,7 +2225,7 @@ msgstr ""
 "\n"
 "“dselect”提供了更容易使用的套件管理工具。\n"
 
-#: src/main.c:119
+#: src/main.c:121
 #, fuzzy
 msgid ""
 "Type dpkg --help for help about installing and deinstalling packages [*];\n"
@@ -2234,7 +2233,7 @@ msgid ""
 "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 "
@@ -2248,17 +2247,17 @@ msgstr ""
 "輸入 dpkg --licence 可閱讀版權、許可証和無擔保的說明 (GNU GPL)[*]。\n"
 "帶有[*]的選項將會輸出較大篇幅的文字 - 可使用管線將其輸出到“less”或“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 "操作之間有矛盾 -- %s 和 -- %s"
 
-#: src/main.c:189
+#: src/main.c:191
 #, c-format
 msgid "Warning: obsolete option `--%s'\n"
 msgstr "警告：已廢棄不用的選項“--%s”\n"
 
-#: src/main.c:197
+#: src/main.c:199
 #, c-format
 msgid ""
 "%s debugging option, --debug=<octal> or -D<octal>:\n"
@@ -2295,26 +2294,26 @@ msgstr ""
 "可以用位元運算(bitwise-or)把除錯選項組合起來使用。\n"
 "注意，意義和數值將有可能更動。\n"
 
-#: src/main.c:216
+#: src/main.c:218
 msgid "--debug requires an octal argument"
 msgstr "--debug 需要一個八進制的參數"
 
-#: src/main.c:240
+#: src/main.c:242
 #, c-format
 msgid "null package name in --ignore-depends comma-separated list `%.250s'"
 msgstr "在 --ignore-depends 的用逗號相隔的參數列表“%s”中，發現有的套件名是空的"
 
-#: 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 需要一個有效的套件名。而“%.250s”卻不是﹔%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 "--%s 有一個無效的數字參數：“%.250s”"
 
-#: src/main.c:292
+#: src/main.c:294
 #, c-format
 msgid ""
 "%s forcing options - control behaviour when problems found:\n"
@@ -2387,48 +2386,48 @@ msgstr ""
 "警告 - 使用帶有[!]標記的選項可能會嚴重破壞您的系統安裝。\n"
 "預設情況下，是使用帶有[*]標記的強制方法。\n"
 
-#: src/main.c:337
+#: src/main.c:339
 #, c-format
 msgid "unknown force/refuse option `%.*s'"
 msgstr "無法識別的 force/refuse 選項“%.*s”"
 
-#: src/main.c:442 src/main.c:446
+#: src/main.c:444 src/main.c:448
 msgid "couldn't malloc in execbackend"
 msgstr "無法在 execbackend 中 malloc"
 
-#: src/main.c:444 src/main.c:451
+#: src/main.c:446 src/main.c:453
 msgid "couldn't strdup in execbackend"
 msgstr "無法在 execbackend 中 strdup"
 
-#: src/main.c:455
+#: src/main.c:457
 #, c-format
 msgid "failed to exec %s"
 msgstr "exec %s 失敗"
 
-#: src/main.c:467
+#: src/main.c:469
 msgid "--command-fd takes 1 argument, not 0"
 msgstr "--command-fd 需要帶一個參數，而不是零個"
 
-#: src/main.c:468
+#: src/main.c:470
 msgid "--command-fd only takes 1 argument"
 msgstr "--command-fd 只需帶一個參數"
 
-#: src/main.c:470
+#: src/main.c:472
 msgid "invalid number for --command-fd"
 msgstr "--command-fd 有一個無效的數字參數"
 
-#: src/main.c:472
+#: src/main.c:474
 #, c-format
 msgid "couldn't open `%i' for stream"
 msgstr "無法打開“%i”，並把它作為串流處理"
 
-#: src/main.c:497
+#: src/main.c:499
 #, c-format
 msgid "unexpected eof before end of line %d"
 msgstr "在第 %d 行還未結束時，發現了預料之外的 eof"
 
-#: 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 "需要一個指示操作的選項"
 
@@ -2811,46 +2810,31 @@ msgstr ""
 "使用 dpkg --info (= dpkg-deb --info) 來檢測打包好的檔案，\n"
 "還可以用過 dpkg --contents (= dpkg-deb --contents) 來列出它們的內容。\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 "”套件管理程序查詢工具\n"
 
-#: src/query.c:473
-#, c-format
-msgid "Usage: "
-msgstr "用法："
-
-#: src/query.c:474
+#: 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 ""
 " [<選項>] <命令>\n"
 "命令：\n"
@@ -2876,10 +2860,25 @@ msgstr ""
 "  欄位一般是靠右對齊的，除非它的寬度是負數。若其寬度是負數，\n"
 "  那麼欄位將會靠左對齊。\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 ""
 "使用 --help 可獲得套件查詢方面的幫助﹔\n"
@@ -3883,106 +3882,99 @@ msgid "menu"
 msgstr "選單"
 
 #: 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” 套件操作前端程式"
 
 #: 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 ""
-"版本 %s。\n"
-"版權所有(C) 1994-1996 Ian Jackson。\n"
-"版權所有(C) 2000,2001 Wichert Akkerman。\n"
-"這是自由軟體﹔要獲知復制該軟體的前提與條件，請參閱 GNU 公共許可証的\n"
-"第二版或其更新的版本。該軟體【不】提供任何擔保。請通過執行\n"
-"dselect --licence 查看詳細的說明。\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"
+"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 [選項]\n"
-"      dselect [選項] 操作 ...\n"
-"選項： --admindir <目錄名稱>  (預設是 /var/lib/dpkg)\n"
-"       --help  --version  --licence  --expert  --debug <檔案名> | -D<檔案名"
-">\n"
-"       --colour screenpart:[前景色],[背景色][:屬性[+屬性+..]]\n"
-"操作： access update select install config remove quit\n"
 
-#: dselect/main.cc:177
+#: dselect/main.cc:187
 #, c-format
 msgid "Screenparts:\n"
 msgstr "顯示部分：\n"
 
-#: dselect/main.cc:182
+#: dselect/main.cc:192
 #, c-format
 msgid "Colours:\n"
 msgstr "顏色：\n"
 
-#: dselect/main.cc:187
+#: dselect/main.cc:197
 #, c-format
 msgid "Attributes:\n"
 msgstr "屬性：\n"
 
-#: dselect/main.cc:207
+#: dselect/main.cc:217
 #, c-format
 msgid "couldn't open debug file `%.255s'\n"
 msgstr "無法打開偵錯檔案“%.255s”\n"
 
-#: dselect/main.cc:222
+#: dselect/main.cc:232
 #, c-format
 msgid "Invalid %s `%s'\n"
 msgstr "無效的 %s “%s”\n"
 
-#: dselect/main.cc:239
+#: dselect/main.cc:249
 msgid "screen part"
 msgstr "顯示哪一部分"
 
-#: dselect/main.cc:245
+#: dselect/main.cc:255
 msgid "Null colour specification\n"
 msgstr "未指定顏色\n"
 
-#: dselect/main.cc:253 dselect/main.cc:258
+#: dselect/main.cc:263 dselect/main.cc:268
 msgid "colour"
 msgstr "顏色"
 
-#: dselect/main.cc:266
+#: dselect/main.cc:276
 msgid "colour attribute"
 msgstr "顏色屬性"
 
-#: dselect/main.cc:300
+#: dselect/main.cc:310
 msgid "Terminal does not appear to support cursor addressing.\n"
 msgstr "終端機不支持游標的定位。\n"
 
-#: dselect/main.cc:302
+#: dselect/main.cc:312
 msgid "Terminal does not appear to support highlighting.\n"
 msgstr "終端機不支持高亮顯示。\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 ""
 "請正確設定您的 TERM 變量，用一個更合適的終端機類型，\n"
 "或者改用針對單一套件的套裝管理工具，即 "
 
-#: dselect/main.cc:306
+#: dselect/main.cc:317
 msgid "terminal lacks necessary features, giving up"
 msgstr "由於終端機缺乏必要的特色，只得中止操作"
 
-#: dselect/main.cc:384
+#: dselect/main.cc:395
 msgid ""
 "\n"
 "\n"
@@ -3996,7 +3988,7 @@ msgstr ""
 "按 <enter> 來確認。  用 ^L 來重繪螢幕。\n"
 "\n"
 
-#: dselect/main.cc:398
+#: dselect/main.cc:410
 msgid ""
 "\n"
 "\n"
@@ -4006,11 +3998,11 @@ msgstr ""
 "\n"
 "唯讀存取：僅僅可以預覽被選中的項目！"
 
-#: dselect/main.cc:417
+#: dselect/main.cc:429
 msgid "failed to getch in main menu"
 msgstr "在主選單中 getch 失敗"
 
-#: dselect/main.cc:490
+#: dselect/main.cc:502
 #, c-format
 msgid "unknown action string `%.50s'"
 msgstr "不能識別的操作字串“%.50s”"
@@ -5225,63 +5217,44 @@ msgstr "格式錯誤"
 msgid "--contents takes exactly one argument"
 msgstr "--contents 需要再一個參數"
 
-#: 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 "”套件檔案的後端版本，版本為"
 
-#: 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 ""
-"這是自由軟體﹔要獲知復制該軟體的前提和條件，請參閱 GNU Public Licence \n"
-"第二或更新的版本。該軟體【不】提供任何擔保。\n"
-"請通過執行 dpkg-deb --licence 來查看版權和許可証的細節。\n"
-
-#: dpkg-deb/main.c:58
-#, fuzzy
+#: 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"
-"\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"
+"  -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"
-"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 ""
 "命令：\n"
 "  -b|--build <目錄> [<deb>]         建立一個壓縮檔案。\n"
@@ -5322,7 +5295,16 @@ msgstr ""
 "則用於簡便的套件管理。另外，透過“dpkg-deb --extract”指令\n"
 "解壓的套件將不被正確地安裝！\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."
@@ -5330,7 +5312,7 @@ msgstr ""
 "輸入 dpkg-deb --help 可獲得有關操作 *.deb 檔案的幫助﹔\n"
 "輸入 dpkg --help 可獲得有關安裝和移除套件的幫助。"
 
-#: dpkg-deb/main.c:176
+#: dpkg-deb/main.c:181
 #, c-format
 msgid "unknown compression type `%s'!"
 msgstr "無法識別的壓縮類型“%s”！"
@@ -5492,41 +5474,40 @@ msgstr "--join 選項需要一個或多個分塊檔案的檔案名作為參數"
 msgid "part %d is missing"
 msgstr "缺少第 %d 個分塊"
 
-#: 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”﹔版本為"
 
-#: 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 ""
-"版權所有 (C) 1994-1996 Ian Jackson。這是自由軟體﹔要獲知復制該\n"
-"軟體的前提和條件，請參閱 GNU 公共許可証的第二版或其更新的版本。\n"
-"該軟體【不】提供任何擔保。請執行 dpkg-split --licence 以查看詳細的說明。\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 ""
@@ -5548,30 +5529,30 @@ msgstr ""
 "\n"
 "返回碼: 0 = OK;  1 = -a 不是一個分塊;  2 = 出錯了！\n"
 
-#: dpkg-split/main.c:69
+#: dpkg-split/main.c:75
 msgid "Type dpkg-split --help for help."
 msgstr "輸入 dpkg-split --help 就可以閱讀幫助訊息。"
 
-#: dpkg-split/main.c:79
+#: dpkg-split/main.c:85
 #, c-format
 msgid "error reading %s"
 msgstr "讀取 %s 時出錯"
 
-#: dpkg-split/main.c:83
+#: dpkg-split/main.c:89
 #, c-format
 msgid "error reading %.250s"
 msgstr "讀取 %.250s 時出錯"
 
-#: dpkg-split/main.c:84
+#: dpkg-split/main.c:90
 #, c-format
 msgid "unexpected end of file in %.250s"
 msgstr "在 %.250s 中發現非預期的檔案結束符號"
 
-#: dpkg-split/main.c:104
+#: dpkg-split/main.c:110
 msgid "part size is far too large or is not positive"
 msgstr "分塊檔案的大小已遠遠過長或者不是正數"
 
-#: 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 "分塊檔案的大小至少必須大於 %dk (為了容下標頭檔案)"
@@ -5706,6 +5687,68 @@ msgstr "原始檔案“%.250s”不是普通檔案"
 msgid "unable to exec mksplit"
 msgstr "無法執行 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 ""
+#~ "這是自由軟體﹔要取得複製該軟體的前提和條件，請參閱 GNU 公共許可証的\n"
+#~ "第二版或其更新的版本。該軟體【不】提供任何擔保。\n"
+#~ "請通過執行 "
+
+#~ msgid " --licence for copyright and license details.\n"
+#~ msgstr " --licence 來查看版權和許可証的細節。\n"
+
+#~ msgid "Debian `"
+#~ msgstr "Debian “"
+
+#~ msgid "Usage: "
+#~ msgstr "用法："
+
+#~ 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 ""
+#~ "版本 %s。\n"
+#~ "版權所有(C) 1994-1996 Ian Jackson。\n"
+#~ "版權所有(C) 2000,2001 Wichert Akkerman。\n"
+#~ "這是自由軟體﹔要獲知復制該軟體的前提與條件，請參閱 GNU 公共許可証的\n"
+#~ "第二版或其更新的版本。該軟體【不】提供任何擔保。請通過執行\n"
+#~ "dselect --licence 查看詳細的說明。\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 ""
+#~ "用法：dselect [選項]\n"
+#~ "      dselect [選項] 操作 ...\n"
+#~ "選項： --admindir <目錄名稱>  (預設是 /var/lib/dpkg)\n"
+#~ "       --help  --version  --licence  --expert  --debug <檔案名> | -D<檔案"
+#~ "名>\n"
+#~ "       --colour screenpart:[前景色],[背景色][:屬性[+屬性+..]]\n"
+#~ "操作： 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 ""
+#~ "版權所有 (C) 1994-1996 Ian Jackson。這是自由軟體﹔要獲知復制該\n"
+#~ "軟體的前提和條件，請參閱 GNU 公共許可証的第二版或其更新的版本。\n"
+#~ "該軟體【不】提供任何擔保。請執行 dpkg-split --licence 以查看詳細的說明。\n"
+
 #~ msgid "Type md5sum --help for help."
 #~ msgstr "輸入 md5sum --help 就可以閱讀幫助訊息。"
 

src/main.c

@@ -41,77 +41,79 @@
 #include "main.h"
 
 static void printversion(void) {
-  if (fputs(_("Debian GNU/Linux `"), stdout) < 0) werr("stdout");
-  if (fputs(DPKG, stdout) < 0) werr("stdout");
-  if (fputs(_("' package management program version "), stdout) < 0) werr("stdout");
-  if (fputs( DPKG_VERSION_ARCH ".\n", stdout) < 0) werr("stdout");
-  if (fputs(_( "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 " --licence for copyright and license details.\n"),
-		 stdout) < 0) werr("stdout");
+  if (printf(_("Debian `%s' package management program version %s.\n"),
+	     DPKG, DPKG_VERSION_ARCH) < 0) werr("stdout");
+  if (printf(_("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"),
+	     DPKG) < 0) werr("stdout");
 }
 /*
    options that need fixing:
   dpkg --yet-to-unpack                 \n\
   */
 static void usage(void) {
-  if (fprintf (stdout, _("\
-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\
-\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\
-\n\
-For internal use: dpkg --assert-support-predepends | --predep-package |\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\
-  -G|--refuse-downgrade      Skip packages with earlier version than 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\
-  --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\
-  --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\
-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\
-\n\
-Use `dselect' or `aptitude' for user-friendly package management.\n"),
-	    BACKEND, ADMINDIR) < 0) werr ("stdout");
+  if (fprintf (stdout, _(
+"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"
+"\n"
+"For internal use: dpkg --assert-support-predepends | --predep-package |\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"
+"  -G|--refuse-downgrade      Skip packages with earlier version than 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"
+"  --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"
+"  --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"
+"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"
+"\n"
+"Use `dselect' or `aptitude' for user-friendly package management.\n"),
+	    DPKG, BACKEND, ADMINDIR) < 0) werr ("stdout");
 }
 
 const char thisname[]= "dpkg";
@@ -122,7 +124,7 @@ 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) [*].\n\
+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 `more' !");
 

src/query.c

@@ -456,51 +456,51 @@ void showpackages(const char *const *argv) {
 }
 
 static void printversion(void) {
-  if (fputs(_("Debian `"), stdout) < 0) werr("stdout");
-  if (fputs(DPKGQUERY, stdout) < 0) werr("stdout");
-  if (fputs(_("' package management program query tool\n"), stdout) < 0)
-    werr("stdout");
-  if (fputs(_( "This is free software; see the GNU General Public Licence version 2 or\n"
-		"later for copying conditions.  There is NO warranty.\n"
-		"See " DPKGQUERY " --licence for copyright and license details.\n"),
-		 stdout) < 0) werr("stdout");
+  if (printf(_("Debian `%s' package management program query tool\n"),
+	     DPKGQUERY) < 0) werr("stdout");
+  if (printf(_("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"),
+	     DPKGQUERY) < 0) werr("stdout");
 }
 /*
    options that need fixing:
   dpkg --yet-to-unpack                 \n\
   */
 static void usage(void) {
-  if (fprintf (stdout, _("\
-Usage: " DPKGQUERY " [<option>] <command>\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\
-\n\
-Options:\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\
-"),
-	    ADMINDIR) < 0) werr ("stdout");
+  if (printf(_(
+"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                              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"
+"\n"), DPKGQUERY, ADMINDIR) < 0) werr ("stdout");
+
+  if (printf(_(
+"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")) < 0) werr ("stdout");
 }
 
 const char thisname[]= "dpkg-query";
 const char printforhelp[]= N_("\
 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");
 
 const struct cmdinfo *cipaction= 0;