Просмотр исходного кода

dpkg (1.13.3) experimental; urgency=low

  The "Paying off Karma at a vastly acclerated rate" Release.

  * Missing newline added to warning output function.  Closes: #283798.
  * Fixed prototype warning in dpkg-scansources.  Closes: #213577, #219760,
    #267505.
  * Removed trailing line from debian origins file.  Closes: #264904.
  * Changed dpkg-buildpackage to say "source changed by" rather than
    "source maintainer is".  Closes: #247313.
  * Fixed dpkg-gencontrol to allow '-' in architecture names.  Closes: #274677.
  * Fixed "unknown information field" error to report field that it doesn't
    know about.  Closes: #275243.

  * Documentation:
    - Remove "medium-level" from description of dpkg.  Closes: #292454.
    - Harmonised argument names in update-alternatives(8).
      Closes: #267095, #284941
    - Documented what the '+' and '*' mean in update-alternatives --config
      output.  Closes: #270486.
    - Mention aptitude alongside dselect in 'dpkg --usage' and
      'dpkg-deb --help', fix quote style of mention in 'dpkg --help'.
      Closes: #274800, #278118.
    - Associate --truename with the description of what it does in
      dpkg-divert(8).  Closes: #277076.
    - Removed last remaining references to the packaging manual, replacing
      with better references.  Closes: #262775.
    - Documented format of file dpkg --set-selections takes.  Closes: #270043.

 -- Scott James Remnant <scott@netsplit.com>  Mon, 21 Mar 2005 03:10:27 +0000
Scott James Remnant лет назад: 21
Родитель
Сommit
4cc3ae4b3a
74 измененных файлов с 1066 добавлено и 923 удалено
  1. 73 0
      ChangeLog
  2. 10 10
      configure
  3. 1 1
      configure.ac
  4. 37 3
      debian/changelog
  5. 2 2
      dpkg-deb/main.c
  6. 1 1
      lib/ehandle.c
  7. 2 5
      man/C/deb-old.5
  8. 3 6
      man/C/deb.5
  9. 2 2
      man/C/dpkg-divert.8
  10. 4 11
      man/C/dpkg-source.1
  11. 8 5
      man/C/dpkg.1
  12. 4 3
      man/C/dselect.1
  13. 12 15
      man/C/update-alternatives.8
  14. 0 1
      origins/debian
  15. BIN
      po/bs.gmo
  16. 31 31
      po/bs.po
  17. BIN
      po/ca.gmo
  18. 33 31
      po/ca.po
  19. BIN
      po/cs.gmo
  20. 33 31
      po/cs.po
  21. BIN
      po/da.gmo
  22. 33 31
      po/da.po
  23. BIN
      po/de.gmo
  24. 33 31
      po/de.po
  25. 31 31
      po/dpkg.pot
  26. BIN
      po/el.gmo
  27. 33 31
      po/el.po
  28. BIN
      po/es.gmo
  29. 33 31
      po/es.po
  30. BIN
      po/eu.gmo
  31. 33 31
      po/eu.po
  32. BIN
      po/fr.gmo
  33. 33 31
      po/fr.po
  34. BIN
      po/gl.gmo
  35. 33 31
      po/gl.po
  36. BIN
      po/he.gmo
  37. 31 31
      po/he.po
  38. BIN
      po/id.gmo
  39. 31 31
      po/id.po
  40. BIN
      po/it.gmo
  41. 33 31
      po/it.po
  42. BIN
      po/ja.gmo
  43. 33 31
      po/ja.po
  44. BIN
      po/ko.gmo
  45. 33 31
      po/ko.po
  46. BIN
      po/nb.gmo
  47. 33 31
      po/nb.po
  48. BIN
      po/nl.gmo
  49. 33 31
      po/nl.po
  50. BIN
      po/nn.gmo
  51. 33 31
      po/nn.po
  52. BIN
      po/pl.gmo
  53. 33 31
      po/pl.po
  54. BIN
      po/pt.gmo
  55. 33 31
      po/pt.po
  56. BIN
      po/pt_BR.gmo
  57. 33 31
      po/pt_BR.po
  58. BIN
      po/ru.gmo
  59. 33 31
      po/ru.po
  60. BIN
      po/sk.gmo
  61. 33 31
      po/sk.po
  62. BIN
      po/sv.gmo
  63. 33 31
      po/sv.po
  64. BIN
      po/zh_CN.gmo
  65. 33 31
      po/zh_CN.po
  66. BIN
      po/zh_TW.gmo
  67. 33 31
      po/zh_TW.po
  68. 2 2
      scripts/changelog/debian.pl
  69. 1 2
      scripts/controllib.pl
  70. 6 6
      scripts/dpkg-buildpackage.sh
  71. 1 1
      scripts/dpkg-gencontrol.pl
  72. 1 1
      scripts/dpkg-scansources.pl
  73. 2 2
      src/main.c
  74. 11 7
      src/query.c

+ 73 - 0
ChangeLog

@@ -1,5 +1,78 @@
+2005-03-21  Scott James Remnant  <scott@netsplit.com>
+
+	* scripts/controllib.pl (unknown): Output field name we have in
+	hand, rather than trying to look it up in a dictionary in which
+	it doesn't exist yet.
+
+	* scripts/changelog/debian.pl: Revert accidental half-patch that
+	turned the Maintainer field into a Changed-By field.
+
+2005-03-21  Marc Dequènes  <duck@duckcorp.org>
+
+	* scripts/dpkg-gencontrol.pl: Fix filename regexp to allow '-'
+	in architecture names.
+
+2005-03-20  Scott James Remnant  <scott@netsplit.com>
+
+	* scripts/dpkg-buildpackage.sh: Output "source changed by"
+	rather than "source maintainer is".
+
+	* man/C/dpkg.1: Document that --get-selections takes a package
+	name pattern.  Document format of file --set-selections takes.
+
+	* man/C/dpkg-source.1: Remove unnecessary references to policy
+	and non-existant packaging manual.  Refer to dpkg-shlibdeps(1)
+	for shlibs file format.  Will need to document changelog format
+	at some point.
+	* man/C/dselect.1: Remove unnecessary reference to policy, refer
+	other reference to the package by name.
+	* man/C/deb-old.5: Remove reference to non-existant packaging
+	manual.
+	* man/C/deb.5: Remove reference to non-existant packaging
+	manual, will have to document control contents better here later.
+
+	* man/C/dpkg.1: Fix typo (fileis -> file is).
+
+	* origins/debian: Remove trailing line.
+
+2005-03-20  Mathias Weidner  <mathias@weidner.in-bad-schmiedeberg.de>
+
+	* scripts/dpkg-scansources.pl (getopt): Add (@) to prototype.
+
+2005-03-20  Scott James Remnant  <scott@netsplit.com>
+
+	* man/C/update-alternatives.8: Document what the '+' and '*'
+	marked choices in --config output mean.
+
+	* src/main.c (usage): Make aptitude quoting consistent.
+
+	* man/C/dpkg-divert.8: Mention --truename alongside the comment
+	about what it does.
+
+	* src/main.c (printforhelp): Mention aptitude alongside dselect.
+	* dpkg-deb/main.c (usage): Mention aptitude alongside dselect.
+
+	* lib/ehandle.c (warningf): Add missing newline to end of format
+	string.
+
+	* man/C/update-alternatives.8: Harmonise names for arguments to
+	--install option.
+
+	* man/C/dpkg.1: Remove "medium-level" from dpkg's description,
+	it's somewhere between medium and low.  The fact it's a package
+	manager is sufficient description.
+
+	* src/query.c (listpackages): Create a second filtered list of
+	packages, sort that (rather than the complete list) and use that
+	when calling list1package.  This means we only expand to the
+	longest field in the result, not the database.  Hopefully the
+	speed gain of only sorting a filtered list outweights the slighty
+	extra computation time.
+
 2005-03-18  Scott James Remnant  <scott@netsplit.com>
 
+	* configure.ac: Bump version to 1.13.3~.
+
 	* configure.ac: Release 1.13.2.
 
 	* src/query.c (getwidth): Return -1 if we're not on a tty.

+ 10 - 10
configure

@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.59 for dpkg 1.13.2.
+# Generated by GNU Autoconf 2.59 for dpkg 1.13.3.
 #
 # Report bugs to <debian-dpkg@lists.debian.org>.
 #
@@ -269,8 +269,8 @@ SHELL=${CONFIG_SHELL-/bin/sh}
 # Identity of this package.
 PACKAGE_NAME='dpkg'
 PACKAGE_TARNAME='dpkg'
-PACKAGE_VERSION='1.13.2'
-PACKAGE_STRING='dpkg 1.13.2'
+PACKAGE_VERSION='1.13.3'
+PACKAGE_STRING='dpkg 1.13.3'
 PACKAGE_BUGREPORT='debian-dpkg@lists.debian.org'
 
 ac_unique_file="lib/dpkg.h"
@@ -816,7 +816,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures dpkg 1.13.2 to adapt to many kinds of systems.
+\`configure' configures dpkg 1.13.3 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -883,7 +883,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of dpkg 1.13.2:";;
+     short | recursive ) echo "Configuration of dpkg 1.13.3:";;
    esac
   cat <<\_ACEOF
 
@@ -1037,7 +1037,7 @@ fi
 test -n "$ac_init_help" && exit 0
 if $ac_init_version; then
   cat <<\_ACEOF
-dpkg configure 1.13.2
+dpkg configure 1.13.3
 generated by GNU Autoconf 2.59
 
 Copyright (C) 2003 Free Software Foundation, Inc.
@@ -1051,7 +1051,7 @@ cat >&5 <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by dpkg $as_me 1.13.2, which was
+It was created by dpkg $as_me 1.13.3, which was
 generated by GNU Autoconf 2.59.  Invocation command line was
 
   $ $0 $@
@@ -1841,7 +1841,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='dpkg'
- VERSION='1.13.2'
+ VERSION='1.13.3'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -15388,7 +15388,7 @@ _ASBOX
 } >&5
 cat >&5 <<_CSEOF
 
-This file was extended by dpkg $as_me 1.13.2, which was
+This file was extended by dpkg $as_me 1.13.3, which was
 generated by GNU Autoconf 2.59.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -15451,7 +15451,7 @@ _ACEOF
 
 cat >>$CONFIG_STATUS <<_ACEOF
 ac_cs_version="\\
-dpkg config.status 1.13.2
+dpkg config.status 1.13.3
 configured by $0, generated by GNU Autoconf 2.59,
   with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
 

+ 1 - 1
configure.ac

@@ -1,7 +1,7 @@
 # Process this file with autoconf to produce a configure script.
 
 AC_PREREQ(2.59)
-AC_INIT([dpkg], [1.13.2], [debian-dpkg@lists.debian.org])
+AC_INIT([dpkg], [1.13.3], [debian-dpkg@lists.debian.org])
 AC_CONFIG_SRCDIR([lib/dpkg.h])
 AC_CONFIG_MACRO_DIR([m4])
 

+ 37 - 3
debian/changelog

@@ -1,4 +1,37 @@
+dpkg (1.13.3) experimental; urgency=low
+  
+  The "Paying off Karma at a vastly acclerated rate" Release.
+
+  * Missing newline added to warning output function.  Closes: #283798.
+  * Fixed prototype warning in dpkg-scansources.  Closes: #213577, #219760,
+    #267505.
+  * Removed trailing line from debian origins file.  Closes: #264904.
+  * Changed dpkg-buildpackage to say "source changed by" rather than
+    "source maintainer is".  Closes: #247313.
+  * Fixed dpkg-gencontrol to allow '-' in architecture names.  Closes: #274677.
+  * Fixed "unknown information field" error to report field that it doesn't
+    know about.  Closes: #275243.
+
+  * Documentation:
+    - Remove "medium-level" from description of dpkg.  Closes: #292454.
+    - Harmonised argument names in update-alternatives(8).
+      Closes: #267095, #284941
+    - Documented what the '+' and '*' mean in update-alternatives --config
+      output.  Closes: #270486.
+    - Mention aptitude alongside dselect in 'dpkg --usage' and
+      'dpkg-deb --help', fix quote style of mention in 'dpkg --help'.
+      Closes: #274800, #278118.
+    - Associate --truename with the description of what it does in
+      dpkg-divert(8).  Closes: #277076.
+    - Removed last remaining references to the packaging manual, replacing
+      with better references.  Closes: #262775.
+    - Documented format of file dpkg --set-selections takes.  Closes: #270043.
+
+ -- Scott James Remnant <scott@netsplit.com>  Mon, 21 Mar 2005 03:10:27 +0000
+
 dpkg (1.13.2) experimental; urgency=low
+  
+  The "Mysteriously Unnamed" Release.
 
   * md5sum has been removed, the coreutils or textutils version will be
     diverted to /usr/bin/md5sum.  Closes: #6633, #136110.
@@ -84,11 +117,12 @@ dpkg (1.13.0) experimental; urgency=low
   * Correct bashism in disk method update script.  Closes: #260568.
 
   * Scorched-earth reimplementation of the build process and control files
-    with debhelper and automake.  Closes: #217946, #229629, #256589, #260568,
-    #266995, #283640, #292973, #293041.
+    with debhelper and automake.  Closes: #200683, #217946, #229629, #260568,
+    #266995, #279701, #283640, #292973, #293041.
   * Remove SGML and POD documentation formats due to both licensing and
-    sanity issues.  Closes: #285086.
+    sanity issues.  Closes: #285806.
   * The dpkg-doc and dpkg-static packages are no more.
+  * dpkg.cfg cleaned up to remove non-useful examples.  Closes: #169618.
   
  -- Scott James Remnant <scott@netsplit.com>  Fri, 14 Jan 2005 19:28:00 +0000
 

+ 2 - 2
dpkg-deb/main.c

@@ -90,8 +90,8 @@ static void usage(void) {
 "   case left alignment will be used. \n"
 "\n"
 "Use `dpkg' to install and remove packages from your system, or\n"
-"`dselect' for user-friendly package management.  Packages unpacked\n"
-"using `dpkg-deb --extract' will be incorrectly installed !\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");
 }
 

+ 1 - 1
lib/ehandle.c

@@ -266,7 +266,7 @@ void warningf(const char *fmt, ...) {
   vsnprintf(buf,sizeof(buf),fmt,al);
   va_end(al);
 
-  fprintf(stderr,"%s: %s",buf,strerror(e));
+  fprintf(stderr,"%s: %s\n",buf,strerror(e));
 }
 
 void badusage(const char *fmt, ...) {

+ 2 - 5
man/C/deb-old.5

@@ -26,9 +26,7 @@ the length of the first gzipped tarfile.
 Each of these lines is terminated with a single newline character.
 .PP
 The first tarfile contains the control information, as a series of
-ordinary files, described in
-.IR "Debian Packaging Manual, section 2.2".
-The file
+ordinary files.  The file
 .B control
 must be present, as it contains the core control information.
 .PP
@@ -49,5 +47,4 @@ on.  The pathnames do not have leading slashes.
 .SH SEE ALSO
 .BR deb (5),
 .BR dpkg-deb (1),
-.BR deb-control (5),
-.IR "Debian Packaging Manual".
+.BR deb-control (5).

+ 3 - 6
man/C/deb.5

@@ -39,10 +39,8 @@ The second required member is named
 It is a gzipped tar archive containing the package control information,
 as a series of plain files, of which the file
 .B control
-is mandatory and contains the core control information.  Please see the
-.I "Debian Packaging Manual, section 2.2"
-for details of these files.  The control tarball may optionally contain
-an entry for
+is mandatory and contains the core control information.  The control
+tarball may optionally contain an entry for
 .RB ` . ',
 the current directory.
 .PP
@@ -69,5 +67,4 @@ with names starting with something other than underscores, or will
 .SH SEE ALSO
 .BR deb-old (5),
 .BR dpkg-deb (1),
-.BR deb-control (5),
-.IR "Debian Packaging Manual".
+.BR deb-control (5).

+ 2 - 2
man/C/dpkg-divert.8

@@ -32,8 +32,8 @@ contains those files.
 is the utility used to set up and update the list of diversions. It
 functions in three basic modes - adding, removing, and listing diversions.
 The options are \-\-add, \-\-remove, and \-\-list, respectively. Additionally,
-it can print out the real name for a diverted file. Other options
-(listed below) may also be specified.
+it can print out the real name for a diverted file with \-\-truename.
+Other options (listed below) may also be specified.
 .SH OPTIONS
 .TP
 .I \-\-admindir <directory>

+ 4 - 11
man/C/dpkg-source.1

@@ -60,8 +60,8 @@ control area file of the package containing the file which
 .B objdump
 reports as satisfying the library dependency, or
 .BR /etc/dpkg/shlibs.default .
-The first match will be used.  See the
-.I Debian packaging manual
+The first match will be used.  See
+.BR dpkg-shlibdeps 1
 for details of the format of shared library dependency files.
 
 .B dpkg\-genchanges
@@ -228,11 +228,8 @@ This option is understood by
 .TP
 .BI \-F changelogformat
 Specifies the format of the changelog.  By default the format is read
-from a special line near the bottom of the changelog (see the
-Debian packaging manual) or failing that defaults to
-.BR debian ,
-the standard format described in the
-.IR "Debian packaging manual" .
+from a special line near the bottom of the changelog or failing that
+defaults to the debian standard format.
 This option is understood by
 .BR dpkg\-source ", " dpkg\-gencontrol " and " dpkg\-genchanges .
 .TP
@@ -801,10 +798,6 @@ It should be possible to specify spaces and shell metacharacters in
 and initial arguments for
 .IR gain-root-command " and " sign-command .
 .SH SEE ALSO
-.IR "Debian packaging manual" ,
-.br
-.IR "Debian policy manual" ,
-.br
 .BR dpkg\-deb (1),
 .BR dpkg (8),
 .BR dselect (8),

+ 8 - 5
man/C/dpkg.1

@@ -1,6 +1,6 @@
 .TH DPKG 1 "April 12, 1998" "Debian Project" "dpkg suite"
 .SH NAME
-dpkg - a medium-level package manager for Debian
+dpkg - package manager for Debian
 
 .SH SYNOPSIS
 .B dpkg
@@ -17,7 +17,7 @@ descriptions of what \fBdpkg\fP does when installing and removing
 packages are particularly inadequate.
 
 .SH DESCRIPTION
-\fBdpkg\fP is a medium-level tool to install, build, remove and manage
+\fBdpkg\fP is a tool to install, build, remove and manage
 Debian packages. The primary and more user-friendly
 front-end for \fBdpkg\fP is \fBdselect\fP(8).  \fBdpkg\fP itself is
 controlled entirely via command line parameters, which consist of exactly
@@ -175,7 +175,7 @@ Debian is simply named \fIPackages\fP.  \fBdpkg\fP keeps its
 record of available packages in \fI/var/lib/dpkg/available\fP.
 
 A simpler one-shot command to retrieve and update the \fIavailable\fR
-fileis \fBdselect update\fR.
+file is \fBdselect update\fR.
 .TP
 \fBdpkg \-A\fP | \fB\-\-record\-avail\fP \fIpackage_file\fP ...
 Update \fBdpkg\fP and \fBdselect\fP's idea of which packages are
@@ -194,11 +194,14 @@ Searches for packages that have been installed only partially on your
 system.  \fBdpkg\fP will suggest what to do with them to get them
 working.
 .TP
-\fBdpkg \-\-get\-selections\fP [\fIpattern\fP...]
+\fBdpkg \-\-get\-selections\fP [\fIpackage-name-pattern\fP...]
 Get list of package selections, and write it to stdout.
 .TP
 .B dpkg \-\-set\-selections
-Set package selections using file read from stdin.
+Set package selections using file read from stdin.  This file should be
+in the format '<package> <state>', where state is one of install, hold,
+deinstall or purge.  Blank lines and comment lines beginning with '#'
+are also permitted.
 .TP
 .B dpkg \-\-yet\-to\-unpack
 Searches for packages selected for installation, but which for some

+ 4 - 3
man/C/dselect.1

@@ -216,7 +216,9 @@ in doing so and can not be assumed to be a sufficient substitute for
 administrator skill and understanding.  The user is required to
 be familiar with the concepts underlying the Debian packaging system.
 In case of doubt, consult the \fBdpkg(8)\fP manpage and the Debian
-policy manual.
+Policy manual, contained in the
+.B debian-policy
+package.
 .sp
 Unless \fBdselect\fP is run in expert
 or immediate mode, a help screen is first displayed when choosing this
@@ -428,8 +430,7 @@ broken, it is also much more flexible than the built in access methods.
 .BR dpkg (8),
 .BR apt-get (8),
 .BR sources.list (5),
-.BR deb (5),
-the Debian policy manual.
+.BR deb (5).
 .SH AUTHORS
 .B dselect
 was written by Ian Jackson (ijackson@gnu.ai.mit.edu). Full list of

+ 12 - 15
man/C/update-alternatives.8

@@ -1,4 +1,4 @@
-.\" update\-alternatives.8
+C.\" update\-alternatives.8
 .\" This man page is copyright 1997 Charles Briscoe-Smith
 .\" This is free documentation; you can redistribute it and/or modify
 .\" it under the terms of the GNU General Public License as published
@@ -12,10 +12,10 @@ update\-alternatives - maintain symbolic links determining default commands
 .B update\-alternatives
 .RI [ options ]
 .B \-\-install
-.I link name path priority
+.I genname symlink altern priority
 .RB [ \-\-slave
-.I link name
-.IR path ]...
+.I genname symlink
+.IR altern ]...
 .PP
 .B update\-alternatives
 .RI [ options ]
@@ -162,7 +162,8 @@ option,
 will list all of the choices for the link group
 of which given
 .I name
-is the master link.
+is the master link.  The current choice is marked with a '*' and the
+choice with the highest priority with a '+'.
 You will then be prompted for which of the choices to use
 for the link group. Once you make a change, the link group will no
 longer be in
@@ -307,20 +308,16 @@ different from the default.
 .\" The names of the arguments should be identical with the ones
 .\" in SYNOPSIS section.
 .TP
-\fB\-\-install\fR \fIgen link alt pri\fR [\fB\-\-slave\fR \fIsgen slink salt\fR] ...
+\fB\-\-install\fR \fIgenname symlink altern priority\fR [\fB\-\-slave\fR \fIgenname symlink altern\fR] ...
 Add a group of alternatives to the system.
-.I gen
+.I genname
 is the generic name for the master link,
-.I link
+.I symlink
 is the name of its symlink in the alternatives directory, and
-.I alt
+.I altern
 is the alternative being introduced for the master link.
-.IR sgen ,
-.I slink
-and
-.I salt
-are the generic name, symlink name in the alternatives directory and alternative
-for a slave link.
+The arguments after \fB\-\-slave\fR are the generic name, symlink name in the
+alternatives directory and alternative for a slave link.
 Zero or more
 .B \-\-slave
 options, each followed by three arguments,

+ 0 - 1
origins/debian

@@ -1,4 +1,3 @@
 Vendor: Debian
 Vendor-URL: http://www.debian.org/
 Bugs: debbugs://bugs.debian.org
-


+ 31 - 31
po/bs.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: 2005-03-18 16:22+0000\n"
+"POT-Creation-Date: 2005-03-21 03:11+0000\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"
@@ -1992,14 +1992,14 @@ msgstr ""
 msgid "' package management program version "
 msgstr ""
 
-#: src/main.c:48 src/query.c:458
+#: src/main.c:48 src/query.c:462
 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:460
+#: src/main.c:50 src/query.c:464
 msgid " --licence for copyright and license details.\n"
 msgstr ""
 
@@ -2067,13 +2067,13 @@ msgid ""
 " 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"
+"Use `dselect' or `aptitude' for user-friendly package management.\n"
 msgstr ""
 
 #: src/main.c:119
 msgid ""
 "Type dpkg --help for help about installing and deinstalling packages [*];\n"
-"Use dselect for user-friendly package management;\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"
@@ -2084,7 +2084,7 @@ msgid ""
 "`more' !"
 msgstr ""
 
-#: src/main.c:184 src/query.c:526 dpkg-deb/main.c:162 dpkg-split/main.c:145
+#: src/main.c:184 src/query.c:530 dpkg-deb/main.c:162 dpkg-split/main.c:145
 #, c-format
 msgid "conflicting actions --%s and --%s"
 msgstr ""
@@ -2220,7 +2220,7 @@ msgstr ""
 msgid "unexpected eof before end of line %d"
 msgstr ""
 
-#: src/main.c:557 src/main.c:572 src/query.c:561 dpkg-deb/main.c:184
+#: src/main.c:557 src/main.c:572 src/query.c:565 dpkg-deb/main.c:184
 #: dpkg-split/main.c:157
 msgid "need an action option"
 msgstr ""
@@ -2230,7 +2230,7 @@ msgstr ""
 msgid "--%s --pending does not take any non-option arguments"
 msgstr ""
 
-#: src/packages.c:109 src/query.c:317
+#: src/packages.c:109 src/query.c:321
 #, c-format
 msgid "--%s needs at least one package name argument"
 msgstr ""
@@ -2511,98 +2511,98 @@ msgstr "Verzija"
 msgid "Description"
 msgstr "Opis"
 
-#: src/query.c:220 src/query.c:442 src/select.c:80
+#: src/query.c:218 src/query.c:446 src/select.c:80
 #, c-format
 msgid "No packages found matching %s.\n"
 msgstr ""
 
-#: src/query.c:236
+#: src/query.c:240
 #, c-format
 msgid "diversion by %s"
 msgstr ""
 
-#: src/query.c:237
+#: src/query.c:241
 #, c-format
 msgid "local diversion"
 msgstr ""
 
-#: src/query.c:238
+#: src/query.c:242
 msgid "to"
 msgstr "za"
 
-#: src/query.c:238
+#: src/query.c:242
 msgid "from"
 msgstr "od"
 
-#: src/query.c:271
+#: src/query.c:275
 msgid "--search needs at least one file name pattern argument"
 msgstr ""
 
-#: src/query.c:299
+#: src/query.c:303
 #, c-format
 msgid "dpkg: %s not found.\n"
 msgstr ""
 
-#: src/query.c:337
+#: src/query.c:341
 #, c-format
 msgid "Package `%s' is not installed and no info is available.\n"
 msgstr ""
 
-#: src/query.c:346
+#: src/query.c:350
 #, c-format
 msgid "Package `%s' is not available.\n"
 msgstr ""
 
-#: src/query.c:356
+#: src/query.c:360
 #, c-format
 msgid "Package `%s' is not installed.\n"
 msgstr ""
 
-#: src/query.c:365
+#: src/query.c:369
 #, c-format
 msgid "Package `%s' does not contain any files (!)\n"
 msgstr ""
 
-#: src/query.c:371
+#: src/query.c:375
 #, c-format
 msgid "locally diverted"
 msgstr ""
 
-#: src/query.c:372
+#: src/query.c:376
 #, c-format
 msgid "package diverts others"
 msgstr ""
 
-#: src/query.c:373
+#: src/query.c:377
 #, c-format
 msgid "diverted by %s"
 msgstr ""
 
-#: src/query.c:374
+#: src/query.c:378
 #, c-format
 msgid " to: %s\n"
 msgstr ""
 
-#: src/query.c:393
+#: src/query.c:397
 msgid ""
 "Use dpkg --info (= dpkg-deb --info) to examine archive files,\n"
 "and dpkg --contents (= dpkg-deb --contents) to list their contents.\n"
 msgstr ""
 
-#: src/query.c:454 dpkg-deb/main.c:46
+#: src/query.c:458 dpkg-deb/main.c:46
 msgid "Debian `"
 msgstr "Debian `"
 
-#: src/query.c:456
+#: src/query.c:460
 msgid "' package management program query tool\n"
 msgstr ""
 
-#: src/query.c:468
+#: src/query.c:472
 #, c-format
 msgid "Usage: "
 msgstr "Upotreba:"
 
-#: src/query.c:469
+#: src/query.c:473
 #, c-format
 msgid ""
 " [<option>] <command>\n"
@@ -2631,7 +2631,7 @@ msgid ""
 "   case left aligenment will be used. \n"
 msgstr ""
 
-#: src/query.c:496
+#: src/query.c:500
 msgid ""
 "Use --help for help about querying packages;\n"
 "Use --licence for copyright licence and lack of warranty (GNU GPL).\n"
@@ -4802,8 +4802,8 @@ msgid ""
 "   case left alignment will be used. \n"
 "\n"
 "Use `dpkg' to install and remove packages from your system, or\n"
-"`dselect' for user-friendly package management.  Packages unpacked\n"
-"using `dpkg-deb --extract' will be incorrectly installed !\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


+ 33 - 31
po/ca.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dpkg 1.10.25\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2005-03-18 16:22+0000\n"
+"POT-Creation-Date: 2005-03-21 03:11+0000\n"
 "PO-Revision-Date: 2005-01-09 19:53+0100\n"
 "Last-Translator: Jordi Mallach <jordi@debian.org>\n"
 "Language-Team: Catalan <debian-l10n-catalan@lists.debian.org>\n"
@@ -2164,7 +2164,7 @@ msgstr "Gestor de paquets «"
 msgid "' package management program version "
 msgstr "» de Debian GNU/Linux, versió "
 
-#: src/main.c:48 src/query.c:458
+#: src/main.c:48 src/query.c:462
 msgid ""
 "This is free software; see the GNU General Public Licence version 2 or\n"
 "later for copying conditions.  There is NO warranty.\n"
@@ -2175,7 +2175,7 @@ msgstr ""
 "o posterior per les condicions de còpia. No hi ha CAP garantia.\n"
 "Vegeu "
 
-#: src/main.c:50 src/query.c:460
+#: src/main.c:50 src/query.c:464
 msgid " --licence for copyright and license details.\n"
 msgstr " --licence pels detalls de copyright i llicència.\n"
 
@@ -2243,7 +2243,7 @@ msgid ""
 " 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"
+"Use `dselect' or `aptitude' for user-friendly package management.\n"
 msgstr ""
 "Forma d'ús: \n"
 "  dpkg -i|--install      <fitxer .deb> ... | -R|--recursive <dir> ...\n"
@@ -2343,9 +2343,10 @@ msgstr ""
 "Useu «dselect» o «aptitude» per a una gestió de paquets més amigable.\n"
 
 #: src/main.c:119
+#, fuzzy
 msgid ""
 "Type dpkg --help for help about installing and deinstalling packages [*];\n"
-"Use dselect for user-friendly package management;\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"
@@ -2368,7 +2369,7 @@ msgstr ""
 "Les opcions marcades amb ([*]) produeixen una extensa eixida - canalitzeu-la "
 "a través de «less» o «more»!"
 
-#: src/main.c:184 src/query.c:526 dpkg-deb/main.c:162 dpkg-split/main.c:145
+#: src/main.c:184 src/query.c:530 dpkg-deb/main.c:162 dpkg-split/main.c:145
 #, c-format
 msgid "conflicting actions --%s and --%s"
 msgstr "accions en conflicte --%s i --%s"
@@ -2572,7 +2573,7 @@ msgstr "no s'ha pogut obrir «%i» per a un flux"
 msgid "unexpected eof before end of line %d"
 msgstr "eof inesperat abans de la fí de la línia %d"
 
-#: src/main.c:557 src/main.c:572 src/query.c:561 dpkg-deb/main.c:184
+#: src/main.c:557 src/main.c:572 src/query.c:565 dpkg-deb/main.c:184
 #: dpkg-split/main.c:157
 msgid "need an action option"
 msgstr "es necessita una opció d'acció"
@@ -2582,7 +2583,7 @@ msgstr "es necessita una opció d'acció"
 msgid "--%s --pending does not take any non-option arguments"
 msgstr "--%s --pending no pren cap argument que no sigui una opció"
 
-#: src/packages.c:109 src/query.c:317
+#: src/packages.c:109 src/query.c:321
 #, c-format
 msgid "--%s needs at least one package name argument"
 msgstr "--%s almenys necessita un nom de paquet com a argument"
@@ -2888,79 +2889,79 @@ msgstr "Versió"
 msgid "Description"
 msgstr "Descripció"
 
-#: src/query.c:220 src/query.c:442 src/select.c:80
+#: src/query.c:218 src/query.c:446 src/select.c:80
 #, c-format
 msgid "No packages found matching %s.\n"
 msgstr "No s'ha trobat cap paquet que correspongui amb %s.\n"
 
-#: src/query.c:236
+#: src/query.c:240
 #, c-format
 msgid "diversion by %s"
 msgstr "desviat per %s"
 
-#: src/query.c:237
+#: src/query.c:241
 #, c-format
 msgid "local diversion"
 msgstr "desviació local"
 
-#: src/query.c:238
+#: src/query.c:242
 msgid "to"
 msgstr "a"
 
-#: src/query.c:238
+#: src/query.c:242
 msgid "from"
 msgstr "per"
 
-#: src/query.c:271
+#: src/query.c:275
 msgid "--search needs at least one file name pattern argument"
 msgstr "--search al menys necessita un nom de fitxer pare com argument"
 
-#: src/query.c:299
+#: src/query.c:303
 #, c-format
 msgid "dpkg: %s not found.\n"
 msgstr "dpkg: %s no trobat.\n"
 
-#: src/query.c:337
+#: src/query.c:341
 #, c-format
 msgid "Package `%s' is not installed and no info is available.\n"
 msgstr "El paquet «%s» no està instal·lat i no hi ha informació disponible.\n"
 
-#: src/query.c:346
+#: src/query.c:350
 #, c-format
 msgid "Package `%s' is not available.\n"
 msgstr "El paquet «%s» no està disponible.\n"
 
-#: src/query.c:356
+#: src/query.c:360
 #, c-format
 msgid "Package `%s' is not installed.\n"
 msgstr "El paquet «%s» no està instal·lat.\n"
 
-#: src/query.c:365
+#: src/query.c:369
 #, c-format
 msgid "Package `%s' does not contain any files (!)\n"
 msgstr "El paquet «%s» no conté cap fitxer (!)\n"
 
-#: src/query.c:371
+#: src/query.c:375
 #, c-format
 msgid "locally diverted"
 msgstr "desviat localment"
 
-#: src/query.c:372
+#: src/query.c:376
 #, c-format
 msgid "package diverts others"
 msgstr "d'altres paquets desviats"
 
-#: src/query.c:373
+#: src/query.c:377
 #, c-format
 msgid "diverted by %s"
 msgstr "desviat per %s"
 
-#: src/query.c:374
+#: src/query.c:378
 #, c-format
 msgid " to: %s\n"
 msgstr " per a: %s\n"
 
-#: src/query.c:393
+#: src/query.c:397
 msgid ""
 "Use dpkg --info (= dpkg-deb --info) to examine archive files,\n"
 "and dpkg --contents (= dpkg-deb --contents) to list their contents.\n"
@@ -2968,21 +2969,21 @@ 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:454 dpkg-deb/main.c:46
+#: src/query.c:458 dpkg-deb/main.c:46
 msgid "Debian `"
 msgstr "Debian «"
 
 # "Debian `dpkg-query' package ..." FIXME. jm
-#: src/query.c:456
+#: src/query.c:460
 msgid "' package management program query tool\n"
 msgstr "» eina de consultes al programa de gestió de paquets\n"
 
-#: src/query.c:468
+#: src/query.c:472
 #, c-format
 msgid "Usage: "
 msgstr "Forma d'ús: "
 
-#: src/query.c:469
+#: src/query.c:473
 #, fuzzy, c-format
 msgid ""
 " [<option>] <command>\n"
@@ -3041,7 +3042,7 @@ msgstr ""
 "  dreta a menys que l'amplada siga negativa, en aquest cas s'utilitzarà\n"
 "  aliniació a l'esquerra. \n"
 
-#: src/query.c:496
+#: src/query.c:500
 msgid ""
 "Use --help for help about querying packages;\n"
 "Use --licence for copyright licence and lack of warranty (GNU GPL).\n"
@@ -5486,6 +5487,7 @@ msgstr ""
 
 # FIXME: Show information on package -> Lowercase "Show"
 #: dpkg-deb/main.c:58
+#, fuzzy
 msgid ""
 "Command:\n"
 "  -b|--build <directory> [<deb>]    build an archive.\n"
@@ -5525,8 +5527,8 @@ msgid ""
 "   case left alignment will be used. \n"
 "\n"
 "Use `dpkg' to install and remove packages from your system, or\n"
-"`dselect' for user-friendly package management.  Packages unpacked\n"
-"using `dpkg-deb --extract' will be incorrectly installed !\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"


+ 33 - 31
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: 2005-03-18 16:22+0000\n"
+"POT-Creation-Date: 2005-03-21 03:11+0000\n"
 "PO-Revision-Date: 2005-01-01 16:47+0100\n"
 "Last-Translator: Miroslav Kure <kurem@debian.cz>\n"
 "Language-Team: Czech <provoz@debian.cz>\n"
@@ -2101,7 +2101,7 @@ msgstr "Debian GNU/Linux `"
 msgid "' package management program version "
 msgstr "' program pro správu balíkù verze "
 
-#: src/main.c:48 src/query.c:458
+#: src/main.c:48 src/query.c:462
 msgid ""
 "This is free software; see the GNU General Public Licence version 2 or\n"
 "later for copying conditions.  There is NO warranty.\n"
@@ -2112,7 +2112,7 @@ msgstr ""
 "novìj¹í. Toto programové vybavení je absolutnì bez záruky.\n"
 "Pou¾itím "
 
-#: src/main.c:50 src/query.c:460
+#: src/main.c:50 src/query.c:464
 msgid " --licence for copyright and license details.\n"
 msgstr " --licence získáte více informací.\n"
 
@@ -2180,7 +2180,7 @@ msgid ""
 " 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"
+"Use `dselect' or `aptitude' for user-friendly package management.\n"
 msgstr ""
 "Pou¾ití: \n"
 "  dpkg -i|--install      <.deb soubor> ... | -R|--recursive <adr> ...\n"
@@ -2258,9 +2258,10 @@ msgstr ""
 "`aptitude'.\n"
 
 #: src/main.c:119
+#, fuzzy
 msgid ""
 "Type dpkg --help for help about installing and deinstalling packages [*];\n"
-"Use dselect for user-friendly package management;\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"
@@ -2281,7 +2282,7 @@ msgstr ""
 "\n"
 "Volby oznaèené [*] produkují obsáhlý výstup - pou¾ijte `less' nebo `more' !"
 
-#: src/main.c:184 src/query.c:526 dpkg-deb/main.c:162 dpkg-split/main.c:145
+#: src/main.c:184 src/query.c:530 dpkg-deb/main.c:162 dpkg-split/main.c:145
 #, c-format
 msgid "conflicting actions --%s and --%s"
 msgstr "odporující si akce --%s a --%s"
@@ -2474,7 +2475,7 @@ msgstr "nelze otev
 msgid "unexpected eof before end of line %d"
 msgstr "neoèekávaný konec souboru pøed koncem øádku %d"
 
-#: src/main.c:557 src/main.c:572 src/query.c:561 dpkg-deb/main.c:184
+#: src/main.c:557 src/main.c:572 src/query.c:565 dpkg-deb/main.c:184
 #: dpkg-split/main.c:157
 msgid "need an action option"
 msgstr "potøebuji zadat akci"
@@ -2484,7 +2485,7 @@ msgstr "pot
 msgid "--%s --pending does not take any non-option arguments"
 msgstr "--%s --pending nemá ¾ádný volitelný argument"
 
-#: src/packages.c:109 src/query.c:317
+#: src/packages.c:109 src/query.c:321
 #, c-format
 msgid "--%s needs at least one package name argument"
 msgstr "--%s potøebuje alespoò jedno jméno balíku"
@@ -2783,79 +2784,79 @@ msgstr "Verze"
 msgid "Description"
 msgstr "Popis"
 
-#: src/query.c:220 src/query.c:442 src/select.c:80
+#: src/query.c:218 src/query.c:446 src/select.c:80
 #, c-format
 msgid "No packages found matching %s.\n"
 msgstr "%s nevyhovuje ¾ádný balík.\n"
 
-#: src/query.c:236
+#: src/query.c:240
 #, c-format
 msgid "diversion by %s"
 msgstr "odsunuto balíkem %s"
 
-#: src/query.c:237
+#: src/query.c:241
 #, c-format
 msgid "local diversion"
 msgstr "místní odsunutí"
 
-#: src/query.c:238
+#: src/query.c:242
 msgid "to"
 msgstr "na"
 
-#: src/query.c:238
+#: src/query.c:242
 msgid "from"
 msgstr "z"
 
-#: src/query.c:271
+#: src/query.c:275
 msgid "--search needs at least one file name pattern argument"
 msgstr "--search potøebuje alespoò jednu souborovou masku"
 
-#: src/query.c:299
+#: src/query.c:303
 #, c-format
 msgid "dpkg: %s not found.\n"
 msgstr "dpkg: %s nenalezen.\n"
 
-#: src/query.c:337
+#: src/query.c:341
 #, c-format
 msgid "Package `%s' is not installed and no info is available.\n"
 msgstr "Balík `%s' není nainstalován a není dostupná ¾ádná informace.\n"
 
-#: src/query.c:346
+#: src/query.c:350
 #, c-format
 msgid "Package `%s' is not available.\n"
 msgstr "Balík `%s' není dostupný.\n"
 
-#: src/query.c:356
+#: src/query.c:360
 #, c-format
 msgid "Package `%s' is not installed.\n"
 msgstr "Balík `%s' není nainstalován.\n"
 
-#: src/query.c:365
+#: src/query.c:369
 #, c-format
 msgid "Package `%s' does not contain any files (!)\n"
 msgstr "Balík `%s' neobsahuje ¾ádné soubory (!)\n"
 
-#: src/query.c:371
+#: src/query.c:375
 #, c-format
 msgid "locally diverted"
 msgstr "místní odsunutí"
 
-#: src/query.c:372
+#: src/query.c:376
 #, c-format
 msgid "package diverts others"
 msgstr "balík odsouvá ostatní"
 
-#: src/query.c:373
+#: src/query.c:377
 #, c-format
 msgid "diverted by %s"
 msgstr "odsunuto balíkem %s"
 
-#: src/query.c:374
+#: src/query.c:378
 #, c-format
 msgid " to: %s\n"
 msgstr " na: %s\n"
 
-#: src/query.c:393
+#: src/query.c:397
 msgid ""
 "Use dpkg --info (= dpkg-deb --info) to examine archive files,\n"
 "and dpkg --contents (= dpkg-deb --contents) to list their contents.\n"
@@ -2863,20 +2864,20 @@ 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:454 dpkg-deb/main.c:46
+#: src/query.c:458 dpkg-deb/main.c:46
 msgid "Debian `"
 msgstr "Debian `"
 
-#: src/query.c:456
+#: src/query.c:460
 msgid "' package management program query tool\n"
 msgstr "' program pro správu balíkù\n"
 
-#: src/query.c:468
+#: src/query.c:472
 #, c-format
 msgid "Usage: "
 msgstr "Pou¾ití: "
 
-#: src/query.c:469
+#: src/query.c:473
 #, fuzzy, c-format
 msgid ""
 " [<option>] <command>\n"
@@ -2926,7 +2927,7 @@ 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:496
+#: src/query.c:500
 msgid ""
 "Use --help for help about querying packages;\n"
 "Use --licence for copyright licence and lack of warranty (GNU GPL).\n"
@@ -5319,6 +5320,7 @@ msgstr ""
 "Více informací získáte pou¾itím dpkg-deb --licence.\n"
 
 #: dpkg-deb/main.c:58
+#, fuzzy
 msgid ""
 "Command:\n"
 "  -b|--build <directory> [<deb>]    build an archive.\n"
@@ -5358,8 +5360,8 @@ msgid ""
 "   case left alignment will be used. \n"
 "\n"
 "Use `dpkg' to install and remove packages from your system, or\n"
-"`dselect' for user-friendly package management.  Packages unpacked\n"
-"using `dpkg-deb --extract' will be incorrectly installed !\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"


+ 33 - 31
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: 2005-03-18 16:22+0000\n"
+"POT-Creation-Date: 2005-03-21 03:11+0000\n"
 "PO-Revision-Date: 2005-01-01 22:10+0100\n"
 "Last-Translator: Claus Hindsgaul <claus_h@image.dk>\n"
 "Language-Team: Danish <dansk@klid.dk>\n"
@@ -2114,7 +2114,7 @@ msgstr "Debian GNU/Linux '"
 msgid "' package management program version "
 msgstr "' forespørgselsværktøj til pakkehåndteringen version "
 
-#: src/main.c:48 src/query.c:458
+#: src/main.c:48 src/query.c:462
 msgid ""
 "This is free software; see the GNU General Public Licence version 2 or\n"
 "later for copying conditions.  There is NO warranty.\n"
@@ -2124,7 +2124,7 @@ msgstr ""
 "senere for kopieringsbetingelser. Der er INGEN garanti.\n"
 "Se "
 
-#: src/main.c:50 src/query.c:460
+#: src/main.c:50 src/query.c:464
 msgid " --licence for copyright and license details.\n"
 msgstr "--licence for detaljer om ophavsret og licens.\n"
 
@@ -2192,7 +2192,7 @@ msgid ""
 " 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"
+"Use `dselect' or `aptitude' for user-friendly package management.\n"
 msgstr ""
 "Brug: \n"
 "  dpkg -i|--install      <.deb-filnavn> ... | -R|--recursive <mappe> ...\n"
@@ -2274,9 +2274,10 @@ msgstr ""
 "Brug 'dselect' eller 'aptitude' for en mere brugervenlig pakkehåndtering.\n"
 
 #: src/main.c:119
+#, fuzzy
 msgid ""
 "Type dpkg --help for help about installing and deinstalling packages [*];\n"
-"Use dselect for user-friendly package management;\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"
@@ -2298,7 +2299,7 @@ msgstr ""
 "Tilvalg markeret med [*] giver mange uddata - led dem gennem 'less' eller "
 "'more'!"
 
-#: src/main.c:184 src/query.c:526 dpkg-deb/main.c:162 dpkg-split/main.c:145
+#: src/main.c:184 src/query.c:530 dpkg-deb/main.c:162 dpkg-split/main.c:145
 #, c-format
 msgid "conflicting actions --%s and --%s"
 msgstr "modstridende handlinger --%s og --%s"
@@ -2491,7 +2492,7 @@ msgstr "kunne ikke 
 msgid "unexpected eof before end of line %d"
 msgstr "uventet slut-på-fil før afslutningen af linje %d"
 
-#: src/main.c:557 src/main.c:572 src/query.c:561 dpkg-deb/main.c:184
+#: src/main.c:557 src/main.c:572 src/query.c:565 dpkg-deb/main.c:184
 #: dpkg-split/main.c:157
 msgid "need an action option"
 msgstr "kræver et handlings-tilvalg"
@@ -2501,7 +2502,7 @@ msgstr "kr
 msgid "--%s --pending does not take any non-option arguments"
 msgstr "--%s --pending tager ingen ikke-tilvalgs-parametre"
 
-#: src/packages.c:109 src/query.c:317
+#: src/packages.c:109 src/query.c:321
 #, c-format
 msgid "--%s needs at least one package name argument"
 msgstr "--%s kræver mindst ét pakkenavn som parameter"
@@ -2801,80 +2802,80 @@ msgstr "Version"
 msgid "Description"
 msgstr "Beskrivelse"
 
-#: src/query.c:220 src/query.c:442 src/select.c:80
+#: src/query.c:218 src/query.c:446 src/select.c:80
 #, c-format
 msgid "No packages found matching %s.\n"
 msgstr "Ingen pakker passede med %s.\n"
 
-#: src/query.c:236
+#: src/query.c:240
 #, c-format
 msgid "diversion by %s"
 msgstr "omrokér med %s"
 
-#: src/query.c:237
+#: src/query.c:241
 #, c-format
 msgid "local diversion"
 msgstr "lokal omrokering"
 
-#: src/query.c:238
+#: src/query.c:242
 msgid "to"
 msgstr "til"
 
-#: src/query.c:238
+#: src/query.c:242
 msgid "from"
 msgstr "fra"
 
-#: src/query.c:271
+#: src/query.c:275
 msgid "--search needs at least one file name pattern argument"
 msgstr "--search kræver mindst ét filnavnsmønster som parameter"
 
-#: src/query.c:299
+#: src/query.c:303
 #, c-format
 msgid "dpkg: %s not found.\n"
 msgstr "dpkg: %s ikke fundet.\n"
 
-#: src/query.c:337
+#: src/query.c:341
 #, c-format
 msgid "Package `%s' is not installed and no info is available.\n"
 msgstr ""
 "Pakken '%s' er ikke installeret og der er ingen tilgængelig information.\n"
 
-#: src/query.c:346
+#: src/query.c:350
 #, c-format
 msgid "Package `%s' is not available.\n"
 msgstr "Pakken '%s' er ikke tilgængelig.\n"
 
-#: src/query.c:356
+#: src/query.c:360
 #, c-format
 msgid "Package `%s' is not installed.\n"
 msgstr "Pakken '%s' er ikke installeret.\n"
 
-#: src/query.c:365
+#: src/query.c:369
 #, c-format
 msgid "Package `%s' does not contain any files (!)\n"
 msgstr "Pakken '%s' indeholder ingen filer (!)\n"
 
-#: src/query.c:371
+#: src/query.c:375
 #, c-format
 msgid "locally diverted"
 msgstr "lokalt omdirigeret"
 
-#: src/query.c:372
+#: src/query.c:376
 #, c-format
 msgid "package diverts others"
 msgstr "pakke omdirigerer andre"
 
-#: src/query.c:373
+#: src/query.c:377
 #, c-format
 msgid "diverted by %s"
 msgstr "omdirigeret af %s"
 
-#: src/query.c:374
+#: src/query.c:378
 #, c-format
 msgid " to: %s\n"
 msgstr " til: %s\n"
 
-#: src/query.c:393
+#: src/query.c:397
 msgid ""
 "Use dpkg --info (= dpkg-deb --info) to examine archive files,\n"
 "and dpkg --contents (= dpkg-deb --contents) to list their contents.\n"
@@ -2882,20 +2883,20 @@ 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:454 dpkg-deb/main.c:46
+#: src/query.c:458 dpkg-deb/main.c:46
 msgid "Debian `"
 msgstr "Debian '"
 
-#: src/query.c:456
+#: src/query.c:460
 msgid "' package management program query tool\n"
 msgstr "' pakkehåndteringsprogram\n"
 
-#: src/query.c:468
+#: src/query.c:472
 #, c-format
 msgid "Usage: "
 msgstr "Brug: "
 
-#: src/query.c:469
+#: src/query.c:473
 #, fuzzy, c-format
 msgid ""
 " [<option>] <command>\n"
@@ -2946,7 +2947,7 @@ 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:496
+#: src/query.c:500
 msgid ""
 "Use --help for help about querying packages;\n"
 "Use --licence for copyright licence and lack of warranty (GNU GPL).\n"
@@ -5350,6 +5351,7 @@ msgstr ""
 "Se dpkg-deb --licence for detaljerne.\n"
 
 #: dpkg-deb/main.c:58
+#, fuzzy
 msgid ""
 "Command:\n"
 "  -b|--build <directory> [<deb>]    build an archive.\n"
@@ -5389,8 +5391,8 @@ msgid ""
 "   case left alignment will be used. \n"
 "\n"
 "Use `dpkg' to install and remove packages from your system, or\n"
-"`dselect' for user-friendly package management.  Packages unpacked\n"
-"using `dpkg-deb --extract' will be incorrectly installed !\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"


+ 33 - 31
po/de.po

@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Debian dpkg 1.10.26\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2005-03-18 16:22+0000\n"
+"POT-Creation-Date: 2005-03-21 03:11+0000\n"
 "PO-Revision-Date: 2005-01-03 11:24 +0100\n"
 "Last-Translator: Michael Piefel <piefel@debian.org>\n"
 "Language-Team: German <de@debian-l10n-german@lists.debian.org>\n"
@@ -2129,7 +2129,7 @@ msgstr "Debian GNU/Linux »"
 msgid "' package management program version "
 msgstr "« Paketmanagement-Programm Version "
 
-#: src/main.c:48 src/query.c:458
+#: src/main.c:48 src/query.c:462
 msgid ""
 "This is free software; see the GNU General Public Licence version 2 or\n"
 "later for copying conditions.  There is NO warranty.\n"
@@ -2140,7 +2140,7 @@ msgstr ""
 "übernommen.\n"
 "Siehe auch "
 
-#: src/main.c:50 src/query.c:460
+#: src/main.c:50 src/query.c:464
 msgid " --licence for copyright and license details.\n"
 msgstr "--licence für Details zum Copyright und der Lizenz.\n"
 
@@ -2208,7 +2208,7 @@ msgid ""
 " 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"
+"Use `dselect' or `aptitude' for user-friendly package management.\n"
 msgstr ""
 "Aufruf: \n"
 "  dpkg -i|--install      <.deb-Dateiname> ... | -R|--recursive <Verz.> ...\n"
@@ -2292,9 +2292,10 @@ msgstr ""
 "Paketmanagement.\n"
 
 #: src/main.c:119
+#, fuzzy
 msgid ""
 "Type dpkg --help for help about installing and deinstalling packages [*];\n"
-"Use dselect for user-friendly package management;\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"
@@ -2313,7 +2314,7 @@ msgstr ""
 "\n"
 "Optionen mit [*] geben viel aus - schicken Sie es durch »less« oder »more«!"
 
-#: src/main.c:184 src/query.c:526 dpkg-deb/main.c:162 dpkg-split/main.c:145
+#: src/main.c:184 src/query.c:530 dpkg-deb/main.c:162 dpkg-split/main.c:145
 #, c-format
 msgid "conflicting actions --%s and --%s"
 msgstr "Aktionen --%s und --%s stehen in Konflikt"
@@ -2516,7 +2517,7 @@ msgstr "konnte »%i« nicht für Stream öffnen"
 msgid "unexpected eof before end of line %d"
 msgstr "unerwartetes Dateiende vor Ende der Zeile %d"
 
-#: src/main.c:557 src/main.c:572 src/query.c:561 dpkg-deb/main.c:184
+#: src/main.c:557 src/main.c:572 src/query.c:565 dpkg-deb/main.c:184
 #: dpkg-split/main.c:157
 msgid "need an action option"
 msgstr "brauche eine Aktions-Option"
@@ -2526,7 +2527,7 @@ msgstr "brauche eine Aktions-Option"
 msgid "--%s --pending does not take any non-option arguments"
 msgstr "--%s --pending nimmt keine Nicht-Options-Argumente"
 
-#: src/packages.c:109 src/query.c:317
+#: src/packages.c:109 src/query.c:321
 #, c-format
 msgid "--%s needs at least one package name argument"
 msgstr "--%s benötigt wenigstens ein Paketnamen-Argument"
@@ -2830,79 +2831,79 @@ msgstr "Version"
 msgid "Description"
 msgstr "Beschreibung"
 
-#: src/query.c:220 src/query.c:442 src/select.c:80
+#: src/query.c:218 src/query.c:446 src/select.c:80
 #, c-format
 msgid "No packages found matching %s.\n"
 msgstr "Kein Paket gefunden, das auf %s passt.\n"
 
-#: src/query.c:236
+#: src/query.c:240
 #, c-format
 msgid "diversion by %s"
 msgstr "Umleitung durch %s"
 
-#: src/query.c:237
+#: src/query.c:241
 #, c-format
 msgid "local diversion"
 msgstr "lokale Umleitung"
 
-#: src/query.c:238
+#: src/query.c:242
 msgid "to"
 msgstr "zu"
 
-#: src/query.c:238
+#: src/query.c:242
 msgid "from"
 msgstr "von"
 
-#: src/query.c:271
+#: src/query.c:275
 msgid "--search needs at least one file name pattern argument"
 msgstr "--search benötigt wenigstens ein Dateinamenmuster-Argument"
 
-#: src/query.c:299
+#: src/query.c:303
 #, c-format
 msgid "dpkg: %s not found.\n"
 msgstr "dpkg: %s nicht gefunden.\n"
 
-#: src/query.c:337
+#: src/query.c:341
 #, c-format
 msgid "Package `%s' is not installed and no info is available.\n"
 msgstr "Paket »%s« ist nicht installiert und keine Info ist vorhanden.\n"
 
-#: src/query.c:346
+#: src/query.c:350
 #, c-format
 msgid "Package `%s' is not available.\n"
 msgstr "Paket »%s« ist nicht verfügbar.\n"
 
-#: src/query.c:356
+#: src/query.c:360
 #, c-format
 msgid "Package `%s' is not installed.\n"
 msgstr "Paket »%s« ist nicht installiert.\n"
 
-#: src/query.c:365
+#: src/query.c:369
 #, c-format
 msgid "Package `%s' does not contain any files (!)\n"
 msgstr "Paket »%s« enthält keine Dateien (!)\n"
 
-#: src/query.c:371
+#: src/query.c:375
 #, c-format
 msgid "locally diverted"
 msgstr "lokal umgeleitet"
 
-#: src/query.c:372
+#: src/query.c:376
 #, c-format
 msgid "package diverts others"
 msgstr "Paket leitet andere um"
 
-#: src/query.c:373
+#: src/query.c:377
 #, c-format
 msgid "diverted by %s"
 msgstr "umgeleitet durch %s"
 
-#: src/query.c:374
+#: src/query.c:378
 #, c-format
 msgid " to: %s\n"
 msgstr " zu: %s\n"
 
-#: src/query.c:393
+#: src/query.c:397
 msgid ""
 "Use dpkg --info (= dpkg-deb --info) to examine archive files,\n"
 "and dpkg --contents (= dpkg-deb --contents) to list their contents.\n"
@@ -2911,20 +2912,20 @@ msgstr ""
 "und     dpkg --contents (= dpkg-deb --contents) zum Auflisten ihres "
 "Inhalts.\n"
 
-#: src/query.c:454 dpkg-deb/main.c:46
+#: src/query.c:458 dpkg-deb/main.c:46
 msgid "Debian `"
 msgstr "Debian »"
 
-#: src/query.c:456
+#: src/query.c:460
 msgid "' package management program query tool\n"
 msgstr "« Paketmanagement-Programm-Abfrage-Werkzeug\n"
 
-#: src/query.c:468
+#: src/query.c:472
 #, c-format
 msgid "Usage: "
 msgstr "Aufruf: "
 
-#: src/query.c:469
+#: src/query.c:473
 #, fuzzy, c-format
 msgid ""
 " [<option>] <command>\n"
@@ -2978,7 +2979,7 @@ msgstr ""
 "normalerweise\n"
 "  rechts ausgerichtet; wenn die Breite negativ ist, dann links.\n"
 
-#: src/query.c:496
+#: src/query.c:500
 msgid ""
 "Use --help for help about querying packages;\n"
 "Use --licence for copyright licence and lack of warranty (GNU GPL).\n"
@@ -5425,6 +5426,7 @@ msgstr ""
 "Siehe auch dpkg-deb --licence für Details.\n"
 
 #: dpkg-deb/main.c:58
+#, fuzzy
 msgid ""
 "Command:\n"
 "  -b|--build <directory> [<deb>]    build an archive.\n"
@@ -5464,8 +5466,8 @@ msgid ""
 "   case left alignment will be used. \n"
 "\n"
 "Use `dpkg' to install and remove packages from your system, or\n"
-"`dselect' for user-friendly package management.  Packages unpacked\n"
-"using `dpkg-deb --extract' will be incorrectly installed !\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"

+ 31 - 31
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: 2005-03-18 16:22+0000\n"
+"POT-Creation-Date: 2005-03-21 03:11+0000\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"
@@ -1989,14 +1989,14 @@ msgstr ""
 msgid "' package management program version "
 msgstr ""
 
-#: src/main.c:48 src/query.c:458
+#: src/main.c:48 src/query.c:462
 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:460
+#: src/main.c:50 src/query.c:464
 msgid " --licence for copyright and license details.\n"
 msgstr ""
 
@@ -2064,13 +2064,13 @@ msgid ""
 " 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"
+"Use `dselect' or `aptitude' for user-friendly package management.\n"
 msgstr ""
 
 #: src/main.c:119
 msgid ""
 "Type dpkg --help for help about installing and deinstalling packages [*];\n"
-"Use dselect for user-friendly package management;\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"
@@ -2081,7 +2081,7 @@ msgid ""
 "`more' !"
 msgstr ""
 
-#: src/main.c:184 src/query.c:526 dpkg-deb/main.c:162 dpkg-split/main.c:145
+#: src/main.c:184 src/query.c:530 dpkg-deb/main.c:162 dpkg-split/main.c:145
 #, c-format
 msgid "conflicting actions --%s and --%s"
 msgstr ""
@@ -2217,7 +2217,7 @@ msgstr ""
 msgid "unexpected eof before end of line %d"
 msgstr ""
 
-#: src/main.c:557 src/main.c:572 src/query.c:561 dpkg-deb/main.c:184
+#: src/main.c:557 src/main.c:572 src/query.c:565 dpkg-deb/main.c:184
 #: dpkg-split/main.c:157
 msgid "need an action option"
 msgstr ""
@@ -2227,7 +2227,7 @@ msgstr ""
 msgid "--%s --pending does not take any non-option arguments"
 msgstr ""
 
-#: src/packages.c:109 src/query.c:317
+#: src/packages.c:109 src/query.c:321
 #, c-format
 msgid "--%s needs at least one package name argument"
 msgstr ""
@@ -2508,98 +2508,98 @@ msgstr ""
 msgid "Description"
 msgstr ""
 
-#: src/query.c:220 src/query.c:442 src/select.c:80
+#: src/query.c:218 src/query.c:446 src/select.c:80
 #, c-format
 msgid "No packages found matching %s.\n"
 msgstr ""
 
-#: src/query.c:236
+#: src/query.c:240
 #, c-format
 msgid "diversion by %s"
 msgstr ""
 
-#: src/query.c:237
+#: src/query.c:241
 #, c-format
 msgid "local diversion"
 msgstr ""
 
-#: src/query.c:238
+#: src/query.c:242
 msgid "to"
 msgstr ""
 
-#: src/query.c:238
+#: src/query.c:242
 msgid "from"
 msgstr ""
 
-#: src/query.c:271
+#: src/query.c:275
 msgid "--search needs at least one file name pattern argument"
 msgstr ""
 
-#: src/query.c:299
+#: src/query.c:303
 #, c-format
 msgid "dpkg: %s not found.\n"
 msgstr ""
 
-#: src/query.c:337
+#: src/query.c:341
 #, c-format
 msgid "Package `%s' is not installed and no info is available.\n"
 msgstr ""
 
-#: src/query.c:346
+#: src/query.c:350
 #, c-format
 msgid "Package `%s' is not available.\n"
 msgstr ""
 
-#: src/query.c:356
+#: src/query.c:360
 #, c-format
 msgid "Package `%s' is not installed.\n"
 msgstr ""
 
-#: src/query.c:365
+#: src/query.c:369
 #, c-format
 msgid "Package `%s' does not contain any files (!)\n"
 msgstr ""
 
-#: src/query.c:371
+#: src/query.c:375
 #, c-format
 msgid "locally diverted"
 msgstr ""
 
-#: src/query.c:372
+#: src/query.c:376
 #, c-format
 msgid "package diverts others"
 msgstr ""
 
-#: src/query.c:373
+#: src/query.c:377
 #, c-format
 msgid "diverted by %s"
 msgstr ""
 
-#: src/query.c:374
+#: src/query.c:378
 #, c-format
 msgid " to: %s\n"
 msgstr ""
 
-#: src/query.c:393
+#: src/query.c:397
 msgid ""
 "Use dpkg --info (= dpkg-deb --info) to examine archive files,\n"
 "and dpkg --contents (= dpkg-deb --contents) to list their contents.\n"
 msgstr ""
 
-#: src/query.c:454 dpkg-deb/main.c:46
+#: src/query.c:458 dpkg-deb/main.c:46
 msgid "Debian `"
 msgstr ""
 
-#: src/query.c:456
+#: src/query.c:460
 msgid "' package management program query tool\n"
 msgstr ""
 
-#: src/query.c:468
+#: src/query.c:472
 #, c-format
 msgid "Usage: "
 msgstr ""
 
-#: src/query.c:469
+#: src/query.c:473
 #, c-format
 msgid ""
 " [<option>] <command>\n"
@@ -2628,7 +2628,7 @@ msgid ""
 "   case left aligenment will be used. \n"
 msgstr ""
 
-#: src/query.c:496
+#: src/query.c:500
 msgid ""
 "Use --help for help about querying packages;\n"
 "Use --licence for copyright licence and lack of warranty (GNU GPL).\n"
@@ -4793,8 +4793,8 @@ msgid ""
 "   case left alignment will be used. \n"
 "\n"
 "Use `dpkg' to install and remove packages from your system, or\n"
-"`dselect' for user-friendly package management.  Packages unpacked\n"
-"using `dpkg-deb --extract' will be incorrectly installed !\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


+ 33 - 31
po/el.po

@@ -15,7 +15,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dpkg_1_13_po_el\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2005-03-18 16:22+0000\n"
+"POT-Creation-Date: 2005-03-21 03:11+0000\n"
 "PO-Revision-Date: 2005-02-20 14:49EEST\n"
 "Last-Translator: Greek Translation Team <debian-l10n-greek@lists.debian."
 "org>\n"
@@ -2160,7 +2160,7 @@ msgstr "Debian GNU/Linux `"
 msgid "' package management program version "
 msgstr "' έκδοση προγράμματος διαχείρισης πακέτων "
 
-#: src/main.c:48 src/query.c:458
+#: src/main.c:48 src/query.c:462
 msgid ""
 "This is free software; see the GNU General Public Licence version 2 or\n"
 "later for copying conditions.  There is NO warranty.\n"
@@ -2171,7 +2171,7 @@ msgstr ""
 "μεταγενέστερη για συνθήκες αντιγραφής.  Δεν υπάρχει ΚΑΜΙΑ εγγύηση.\n"
 "Δείτε "
 
-#: src/main.c:50 src/query.c:460
+#: src/main.c:50 src/query.c:464
 msgid " --licence for copyright and license details.\n"
 msgstr " --licence για λεπτομέρειες πνευματικών δικαιωμάτων και άδειας.\n"
 
@@ -2239,7 +2239,7 @@ msgid ""
 " 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"
+"Use `dselect' or `aptitude' for user-friendly package management.\n"
 msgstr ""
 "Χρήση: \n"
 "  dpkg -i|--install      <.deb file name> ... | -R|--recursive <dir> ...\n"
@@ -2312,9 +2312,10 @@ msgstr ""
 "Χρησιμοποιήστε το `dselect' ή το 'aptitude' για φιλική διαχείριση πακέτων.\n"
 
 #: src/main.c:119
+#, fuzzy
 msgid ""
 "Type dpkg --help for help about installing and deinstalling packages [*];\n"
-"Use dselect for user-friendly package management;\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"
@@ -2334,7 +2335,7 @@ msgstr ""
 "Οι επιλογές με [*] εμφανίζουν αρκετό περιεχόμενο - χρησιμοποιήστε μια "
 "σωλήνωση με τις εντολές `less' ή `more' !"
 
-#: src/main.c:184 src/query.c:526 dpkg-deb/main.c:162 dpkg-split/main.c:145
+#: src/main.c:184 src/query.c:530 dpkg-deb/main.c:162 dpkg-split/main.c:145
 #, c-format
 msgid "conflicting actions --%s and --%s"
 msgstr "συγκρουόμενες δράσεις --%s και --%s"
@@ -2537,7 +2538,7 @@ msgstr "αδύνατο το άνοιγμα του `%i' ως ροή (stream)"
 msgid "unexpected eof before end of line %d"
 msgstr "απρόσμενο eof πριν το τέλος της γραμμής %d"
 
-#: src/main.c:557 src/main.c:572 src/query.c:561 dpkg-deb/main.c:184
+#: src/main.c:557 src/main.c:572 src/query.c:565 dpkg-deb/main.c:184
 #: dpkg-split/main.c:157
 msgid "need an action option"
 msgstr "χρειάζεται μια επιλογή ενέργειας"
@@ -2547,7 +2548,7 @@ msgstr "χρειάζεται μια επιλογή ενέργειας"
 msgid "--%s --pending does not take any non-option arguments"
 msgstr "--%s --pending δεν παίρνει κανένα όρισμα μη-επιλογής"
 
-#: src/packages.c:109 src/query.c:317
+#: src/packages.c:109 src/query.c:321
 #, c-format
 msgid "--%s needs at least one package name argument"
 msgstr "--%s χρειάζεται τουλάχιστον ένα όρισμα ονόματος πακέτου"
@@ -2853,83 +2854,83 @@ msgstr "Έκδοση"
 msgid "Description"
 msgstr "Περιγραφή"
 
-#: src/query.c:220 src/query.c:442 src/select.c:80
+#: src/query.c:218 src/query.c:446 src/select.c:80
 #, c-format
 msgid "No packages found matching %s.\n"
 msgstr "Δε βρέθηκαν πακέτα που να ταιριάζουν με %s.\n"
 
-#: src/query.c:236
+#: src/query.c:240
 #, c-format
 msgid "diversion by %s"
 msgstr "παράκαμψη από %s"
 
-#: src/query.c:237
+#: src/query.c:241
 #, c-format
 msgid "local diversion"
 msgstr "τοπική παράκαμψη"
 
-#: src/query.c:238
+#: src/query.c:242
 msgid "to"
 msgstr "προς"
 
-#: src/query.c:238
+#: src/query.c:242
 msgid "from"
 msgstr "από"
 
-#: src/query.c:271
+#: src/query.c:275
 msgid "--search needs at least one file name pattern argument"
 msgstr ""
 "η --search χρειάζεται τουλ.άχιστον μια παράσταση ονομάτων αρχείων ως "
 "παράμετρο"
 
-#: src/query.c:299
+#: src/query.c:303
 #, c-format
 msgid "dpkg: %s not found.\n"
 msgstr "dpkg: Το %s δε βρέθηκε.\n"
 
-#: src/query.c:337
+#: src/query.c:341
 #, c-format
 msgid "Package `%s' is not installed and no info is available.\n"
 msgstr ""
 "Το πακέτο `%s' δεν είναι εγκατεστημένο και δεν υπάρχουν διαθέσιμες "
 "πληροφορίες.\n"
 
-#: src/query.c:346
+#: src/query.c:350
 #, c-format
 msgid "Package `%s' is not available.\n"
 msgstr "Το πακέτο `%s' δεν είναι διαθέσιμο.\n"
 
-#: src/query.c:356
+#: src/query.c:360
 #, c-format
 msgid "Package `%s' is not installed.\n"
 msgstr "Το πακέτο `%s' δεν είναι εγκατεστημένο.\n"
 
-#: src/query.c:365
+#: src/query.c:369
 #, c-format
 msgid "Package `%s' does not contain any files (!)\n"
 msgstr "Το πακέτο `%s' δεν περιέχει κανένα αρχείο (!)\n"
 
-#: src/query.c:371
+#: src/query.c:375
 #, c-format
 msgid "locally diverted"
 msgstr "τοπική παράκαμψη"
 
-#: src/query.c:372
+#: src/query.c:376
 #, c-format
 msgid "package diverts others"
 msgstr "το πακέτο παρακάμπτει άλλα"
 
-#: src/query.c:373
+#: src/query.c:377
 #, c-format
 msgid "diverted by %s"
 msgstr "παρεκάμφθηκε από %s"
 
-#: src/query.c:374
+#: src/query.c:378
 #, c-format
 msgid " to: %s\n"
 msgstr " προς: %s\n"
 
-#: src/query.c:393
+#: src/query.c:397
 msgid ""
 "Use dpkg --info (= dpkg-deb --info) to examine archive files,\n"
 "and dpkg --contents (= dpkg-deb --contents) to list their contents.\n"
@@ -2939,20 +2940,20 @@ msgstr ""
 "και dpkg --contents (= dpkg-deb --contents) για προβολή των περιεχομένων "
 "τους.\n"
 
-#: src/query.c:454 dpkg-deb/main.c:46
+#: src/query.c:458 dpkg-deb/main.c:46
 msgid "Debian `"
 msgstr "Debian `"
 
-#: src/query.c:456
+#: src/query.c:460
 msgid "' package management program query tool\n"
 msgstr "' εργαλείο πληροφόρησης προγράμματος διαχείρισης πακέτων\n"
 
-#: src/query.c:468
+#: src/query.c:472
 #, c-format
 msgid "Usage: "
 msgstr "Χρήση: "
 
-#: src/query.c:469
+#: src/query.c:473
 #, c-format
 msgid ""
 " [<option>] <command>\n"
@@ -3008,7 +3009,7 @@ msgstr ""
 "στοίχιση.\n"
 " \n"
 
-#: src/query.c:496
+#: src/query.c:500
 msgid ""
 "Use --help for help about querying packages;\n"
 "Use --licence for copyright licence and lack of warranty (GNU GPL).\n"
@@ -5452,6 +5453,7 @@ msgstr ""
 "Δείτε dpkg-deb --licence για λεπτομέρειες.\n"
 
 #: dpkg-deb/main.c:58
+#, fuzzy
 msgid ""
 "Command:\n"
 "  -b|--build <directory> [<deb>]    build an archive.\n"
@@ -5491,8 +5493,8 @@ msgid ""
 "   case left alignment will be used. \n"
 "\n"
 "Use `dpkg' to install and remove packages from your system, or\n"
-"`dselect' for user-friendly package management.  Packages unpacked\n"
-"using `dpkg-deb --extract' will be incorrectly installed !\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"


+ 33 - 31
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: 2005-03-18 16:22+0000\n"
+"POT-Creation-Date: 2005-03-21 03:11+0000\n"
 "PO-Revision-Date: 2004-12-31 12:07+0100\n"
 "Last-Translator: Javier Fernández-Sanguino <jfs@debian.org>\n"
 "Language-Team: Spanish <debian-l10n-spanish@lists.debian.org>\n"
@@ -2214,7 +2214,7 @@ msgstr "' de Debian GNU/Linux, versi
 
 # 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:458
+#: src/main.c:48 src/query.c:462
 msgid ""
 "This is free software; see the GNU General Public Licence version 2 or\n"
 "later for copying conditions.  There is NO warranty.\n"
@@ -2224,7 +2224,7 @@ msgstr ""
 "posterior para las condiciones de copia. No hay NINGUNA garantía.\n"
 "Vea "
 
-#: src/main.c:50 src/query.c:460
+#: src/main.c:50 src/query.c:464
 msgid " --licence for copyright and license details.\n"
 msgstr " --license para ver el copyright y más detalles sobre la licencia.\n"
 
@@ -2294,7 +2294,7 @@ msgid ""
 " 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"
+"Use `dselect' or `aptitude' for user-friendly package management.\n"
 msgstr ""
 "Modo de empleo:\n"
 "  dpkg -i|--install      <fichero .deb> ... | -R|--recursive <dir> ...\n"
@@ -2389,9 +2389,10 @@ msgstr ""
 "Utilice `dselect' o 'aptitude' para una gestión de paquetes más amigable.\n"
 
 #: src/main.c:119
+#, fuzzy
 msgid ""
 "Type dpkg --help for help about installing and deinstalling packages [*];\n"
-"Use dselect for user-friendly package management;\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"
@@ -2413,7 +2414,7 @@ msgstr ""
 "Las opciones marcadas con ([*]) producen una salida extensa,\n"
 "¡fíltrela con `less' o con `more'!"
 
-#: src/main.c:184 src/query.c:526 dpkg-deb/main.c:162 dpkg-split/main.c:145
+#: src/main.c:184 src/query.c:530 dpkg-deb/main.c:162 dpkg-split/main.c:145
 #, c-format
 msgid "conflicting actions --%s and --%s"
 msgstr "acciones en conflicto --%s y --%s"
@@ -2622,7 +2623,7 @@ msgstr "no se pudo abrir `%i' para un flujo"
 msgid "unexpected eof before end of line %d"
 msgstr "eof inesperado antes del fin de la línea %d"
 
-#: src/main.c:557 src/main.c:572 src/query.c:561 dpkg-deb/main.c:184
+#: src/main.c:557 src/main.c:572 src/query.c:565 dpkg-deb/main.c:184
 #: dpkg-split/main.c:157
 msgid "need an action option"
 msgstr "se necesita una opción de acción"
@@ -2632,7 +2633,7 @@ msgstr "se necesita una opci
 msgid "--%s --pending does not take any non-option arguments"
 msgstr "--%s --pending no toma ningún argumento que no sea una opción"
 
-#: src/packages.c:109 src/query.c:317
+#: src/packages.c:109 src/query.c:321
 #, c-format
 msgid "--%s needs at least one package name argument"
 msgstr "--%s necesita al menos un nombre de paquete como argumento"
@@ -2943,82 +2944,82 @@ msgstr "Versi
 msgid "Description"
 msgstr "Descripción"
 
-#: src/query.c:220 src/query.c:442 src/select.c:80
+#: src/query.c:218 src/query.c:446 src/select.c:80
 #, c-format
 msgid "No packages found matching %s.\n"
 msgstr "No se ha encontrado ningún paquete que corresponda con %s.\n"
 
-#: src/query.c:236
+#: src/query.c:240
 #, c-format
 msgid "diversion by %s"
 msgstr "desviación por %s"
 
-#: src/query.c:237
+#: src/query.c:241
 #, c-format
 msgid "local diversion"
 msgstr "desviación local"
 
-#: src/query.c:238
+#: src/query.c:242
 msgid "to"
 msgstr "a"
 
-#: src/query.c:238
+#: src/query.c:242
 msgid "from"
 msgstr "desde"
 
-#: src/query.c:271
+#: src/query.c:275
 msgid "--search needs at least one file name pattern argument"
 msgstr ""
 "--search necesita al menos un patrón de nombre de fichero como argumento"
 
-#: src/query.c:299
+#: src/query.c:303
 #, c-format
 msgid "dpkg: %s not found.\n"
 msgstr "dpkg: no se encontró %s.\n"
 
-#: src/query.c:337
+#: src/query.c:341
 #, c-format
 msgid "Package `%s' is not installed and no info is available.\n"
 msgstr ""
 "El paquete `%s' no está instalado y no hay ninguna información disponible.\n"
 
-#: src/query.c:346
+#: src/query.c:350
 #, c-format
 msgid "Package `%s' is not available.\n"
 msgstr "El paquete `%s' no está disponible.\n"
 
-#: src/query.c:356
+#: src/query.c:360
 #, c-format
 msgid "Package `%s' is not installed.\n"
 msgstr "El paquete `%s' no está instalado.\n"
 
-#: src/query.c:365
+#: src/query.c:369
 #, c-format
 msgid "Package `%s' does not contain any files (!)\n"
 msgstr "El paquete `%s' no contiene ningún fichero (¡!)\n"
 
-#: src/query.c:371
+#: src/query.c:375
 #, c-format
 msgid "locally diverted"
 msgstr "desviado localmente"
 
-#: src/query.c:372
+#: src/query.c:376
 #, c-format
 msgid "package diverts others"
 msgstr "el paquete desvía otros"
 
-#: src/query.c:373
+#: src/query.c:377
 #, c-format
 msgid "diverted by %s"
 msgstr "desviado por %s"
 
 # Intraducible sin contexto, posiblemente es un "divert". sv
-#: src/query.c:374
+#: src/query.c:378
 #, c-format
 msgid " to: %s\n"
 msgstr " a: %s\n"
 
-#: src/query.c:393
+#: src/query.c:397
 msgid ""
 "Use dpkg --info (= dpkg-deb --info) to examine archive files,\n"
 "and dpkg --contents (= dpkg-deb --contents) to list their contents.\n"
@@ -3028,20 +3029,20 @@ msgstr ""
 
 # This is broken. Translators do not translate words, they translate complete sentences.
 # I would suggest using %s. sv
-#: src/query.c:454 dpkg-deb/main.c:46
+#: src/query.c:458 dpkg-deb/main.c:46
 msgid "Debian `"
 msgstr "Herramienta de consulta `"
 
-#: src/query.c:456
+#: src/query.c:460
 msgid "' package management program query tool\n"
 msgstr "' del gestor de paquetes de Debian\n"
 
-#: src/query.c:468
+#: src/query.c:472
 #, c-format
 msgid "Usage: "
 msgstr "Modo de empleo: "
 
-#: src/query.c:469
+#: src/query.c:473
 #, fuzzy, c-format
 msgid ""
 " [<option>] <command>\n"
@@ -3100,7 +3101,7 @@ msgstr ""
 "menos\n"
 "  que el ancho sea negativo, en cuyo caso se alinearán a la izquierda.\n"
 
-#: src/query.c:496
+#: src/query.c:500
 msgid ""
 "Use --help for help about querying packages;\n"
 "Use --licence for copyright licence and lack of warranty (GNU GPL).\n"
@@ -5585,6 +5586,7 @@ msgstr ""
 "Véase dpkg-deb --license para más detalles.\n"
 
 #: dpkg-deb/main.c:58
+#, fuzzy
 msgid ""
 "Command:\n"
 "  -b|--build <directory> [<deb>]    build an archive.\n"
@@ -5624,8 +5626,8 @@ msgid ""
 "   case left alignment will be used. \n"
 "\n"
 "Use `dpkg' to install and remove packages from your system, or\n"
-"`dselect' for user-friendly package management.  Packages unpacked\n"
-"using `dpkg-deb --extract' will be incorrectly installed !\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"


+ 33 - 31
po/eu.po

@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dpkg-eu\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2005-03-18 16:22+0000\n"
+"POT-Creation-Date: 2005-03-21 03:11+0000\n"
 "PO-Revision-Date: 2005-01-09 20:49+0100\n"
 "Last-Translator: Piarres Beobide  <pi@beobide.net>\n"
 "Language-Team: Librezale.org <librezale@librezale.org>\n"
@@ -2145,7 +2145,7 @@ msgstr "Debian GNU/Linux `"
 msgid "' package management program version "
 msgstr "' pakete kudeatzaile programa. Bertsioa "
 
-#: src/main.c:48 src/query.c:458
+#: src/main.c:48 src/query.c:462
 msgid ""
 "This is free software; see the GNU General Public Licence version 2 or\n"
 "later for copying conditions.  There is NO warranty.\n"
@@ -2155,7 +2155,7 @@ msgstr ""
 "2 edo beranduagoko bertsio batetan kopiatze baldintzak. EZ du bermerik.\n"
 "Begiratu "
 
-#: src/main.c:50 src/query.c:460
+#: src/main.c:50 src/query.c:464
 msgid " --licence for copyright and license details.\n"
 msgstr " --licence kopiatze eta lizentzi argibide gehiago ikusteko.\n"
 
@@ -2223,7 +2223,7 @@ msgid ""
 " 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"
+"Use `dselect' or `aptitude' for user-friendly package management.\n"
 msgstr ""
 "Erabilera: \n"
 "  dpkg -i|--install      <.deb fitxategi izena> ... | -R|--recursive "
@@ -2316,9 +2316,10 @@ msgstr ""
 "izateko.\n"
 
 #: src/main.c:119
+#, fuzzy
 msgid ""
 "Type dpkg --help for help about installing and deinstalling packages [*];\n"
-"Use dselect for user-friendly package management;\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"
@@ -2340,7 +2341,7 @@ msgstr ""
 "\n"
 " [*] duten aukerek irteera luze bat dute - `less' edo `more' bidez erabili!"
 
-#: src/main.c:184 src/query.c:526 dpkg-deb/main.c:162 dpkg-split/main.c:145
+#: src/main.c:184 src/query.c:530 dpkg-deb/main.c:162 dpkg-split/main.c:145
 #, c-format
 msgid "conflicting actions --%s and --%s"
 msgstr "elkarjotzen duten ekintzak: --%s eta --%s"
@@ -2541,7 +2542,7 @@ msgstr "Ezin da korrontearentzat '%i? ireki"
 msgid "unexpected eof before end of line %d"
 msgstr "ezuzteko fitxategi amaiera %d lerro amaiaeran"
 
-#: src/main.c:557 src/main.c:572 src/query.c:561 dpkg-deb/main.c:184
+#: src/main.c:557 src/main.c:572 src/query.c:565 dpkg-deb/main.c:184
 #: dpkg-split/main.c:157
 msgid "need an action option"
 msgstr "ekintza aukera bat behar da"
@@ -2551,7 +2552,7 @@ msgstr "ekintza aukera bat behar da"
 msgid "--%s --pending does not take any non-option arguments"
 msgstr "--%s --pending ez du aukerez aparte argumenturik onartzen"
 
-#: src/packages.c:109 src/query.c:317
+#: src/packages.c:109 src/query.c:321
 #, c-format
 msgid "--%s needs at least one package name argument"
 msgstr "--%s baintzat pakete izen argumentu bat behar du"
@@ -2853,79 +2854,79 @@ msgstr "Bertsioa"
 msgid "Description"
 msgstr "Azalpena"
 
-#: src/query.c:220 src/query.c:442 src/select.c:80
+#: src/query.c:218 src/query.c:446 src/select.c:80
 #, c-format
 msgid "No packages found matching %s.\n"
 msgstr "ez da %s duen paketerik aurkitu.\n"
 
-#: src/query.c:236
+#: src/query.c:240
 #, c-format
 msgid "diversion by %s"
 msgstr "%s-tik desbideratua"
 
-#: src/query.c:237
+#: src/query.c:241
 #, c-format
 msgid "local diversion"
 msgstr "desbideraketa lokala"
 
-#: src/query.c:238
+#: src/query.c:242
 msgid "to"
 msgstr "nora:"
 
-#: src/query.c:238
+#: src/query.c:242
 msgid "from"
 msgstr "nondik:"
 
-#: src/query.c:271
+#: src/query.c:275
 msgid "--search needs at least one file name pattern argument"
 msgstr "--bilaketak beintzat fitxategi patroi argumentu bat behar du"
 
-#: src/query.c:299
+#: src/query.c:303
 #, c-format
 msgid "dpkg: %s not found.\n"
 msgstr "dpkg: %s ez da aurkitu.\n"
 
-#: src/query.c:337
+#: src/query.c:341
 #, c-format
 msgid "Package `%s' is not installed and no info is available.\n"
 msgstr "`%s' paketea ez dago instalaturik eta ez dago azalpenik erabilgarri.\n"
 
-#: src/query.c:346
+#: src/query.c:350
 #, c-format
 msgid "Package `%s' is not available.\n"
 msgstr "`%s' paketea ez dago eskuragarri.\n"
 
-#: src/query.c:356
+#: src/query.c:360
 #, c-format
 msgid "Package `%s' is not installed.\n"
 msgstr "`%s' paketea ez dago instalaturik.\n"
 
-#: src/query.c:365
+#: src/query.c:369
 #, c-format
 msgid "Package `%s' does not contain any files (!)\n"
 msgstr "`%s' paketeak ez du fitxategirik (!)\n"
 
-#: src/query.c:371
+#: src/query.c:375
 #, c-format
 msgid "locally diverted"
 msgstr "lokalki desbideratua"
 
-#: src/query.c:372
+#: src/query.c:376
 #, c-format
 msgid "package diverts others"
 msgstr "paketeak beste batzu desbideratzen ditu"
 
-#: src/query.c:373
+#: src/query.c:377
 #, c-format
 msgid "diverted by %s"
 msgstr "%s-(e)k desbideratua"
 
-#: src/query.c:374
+#: src/query.c:378
 #, c-format
 msgid " to: %s\n"
 msgstr " nora: %s\n"
 
-#: src/query.c:393
+#: src/query.c:397
 msgid ""
 "Use dpkg --info (= dpkg-deb --info) to examine archive files,\n"
 "and dpkg --contents (= dpkg-deb --contents) to list their contents.\n"
@@ -2933,20 +2934,20 @@ msgstr ""
 "dpkg --info  (= dpkg-deb --info) erabili fitxategia arakatzeko,\n"
 "eta dpkg --contents (= dpkg-deb --contents) bere edukiak zerrendatzeko..\n"
 
-#: src/query.c:454 dpkg-deb/main.c:46
+#: src/query.c:458 dpkg-deb/main.c:46
 msgid "Debian `"
 msgstr "Debian `"
 
-#: src/query.c:456
+#: src/query.c:460
 msgid "' package management program query tool\n"
 msgstr "' pakete kudeatze programa galdeketa lanabesa\n"
 
-#: src/query.c:468
+#: src/query.c:472
 #, c-format
 msgid "Usage: "
 msgstr "Erabilera:"
 
-#: src/query.c:469
+#: src/query.c:473
 #, fuzzy, c-format
 msgid ""
 " [<option>] <command>\n"
@@ -3001,7 +3002,7 @@ msgstr ""
 "negatiboa ez deb bitartean\n"
 "   orduan ezkerretara lerrokatuko dira. \n"
 
-#: src/query.c:496
+#: src/query.c:500
 msgid ""
 "Use --help for help about querying packages;\n"
 "Use --licence for copyright licence and lack of warranty (GNU GPL).\n"
@@ -5427,6 +5428,7 @@ msgstr ""
 "Begiratu dpkg-deb --licence xehetasunentzako.\n"
 
 #: dpkg-deb/main.c:58
+#, fuzzy
 msgid ""
 "Command:\n"
 "  -b|--build <directory> [<deb>]    build an archive.\n"
@@ -5466,8 +5468,8 @@ msgid ""
 "   case left alignment will be used. \n"
 "\n"
 "Use `dpkg' to install and remove packages from your system, or\n"
-"`dselect' for user-friendly package management.  Packages unpacked\n"
-"using `dpkg-deb --extract' will be incorrectly installed !\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"


+ 33 - 31
po/fr.po

@@ -21,7 +21,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Debian dpkg 1.6.13\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2005-03-18 16:22+0000\n"
+"POT-Creation-Date: 2005-03-21 03:11+0000\n"
 "PO-Revision-Date: 2005-01-25 11:26+0100\n"
 "Last-Translator: Christian Perrier <bubulle@debian.org>\n"
 "Language-Team: French <debian-l10n-french@lists.debian.org>\n"
@@ -2250,7 +2250,7 @@ msgstr "Debian GNU-Linux 
 msgid "' package management program version "
 msgstr " » programme de gestion de paquets version "
 
-#: src/main.c:48 src/query.c:458
+#: src/main.c:48 src/query.c:462
 msgid ""
 "This is free software; see the GNU General Public Licence version 2 or\n"
 "later for copying conditions.  There is NO warranty.\n"
@@ -2261,7 +2261,7 @@ msgstr ""
 "conditions de reproduction. Nous n'offrons AUCUNE garantie.\n"
 "Voir "
 
-#: src/main.c:50 src/query.c:460
+#: src/main.c:50 src/query.c:464
 msgid " --licence for copyright and license details.\n"
 msgstr " --licence pour plus de détails sur le copyright et la licence.\n"
 
@@ -2329,7 +2329,7 @@ msgid ""
 " 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"
+"Use `dselect' or `aptitude' for user-friendly package management.\n"
 msgstr ""
 "Syntaxe :\n"
 "  dpkg -i|--install      <nom fichier .deb> ... | -R|--recursive <rép> ...\n"
@@ -2420,9 +2420,10 @@ msgstr ""
 "conviviale.\n"
 
 #: src/main.c:119
+#, fuzzy
 msgid ""
 "Type dpkg --help for help about installing and deinstalling packages [*];\n"
-"Use dselect for user-friendly package management;\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"
@@ -2446,7 +2447,7 @@ msgstr ""
 "Les options marquées d'un [*] affichent beaucoup d'informations - tubez-les "
 "à travers « less » ou « more » !"
 
-#: src/main.c:184 src/query.c:526 dpkg-deb/main.c:162 dpkg-split/main.c:145
+#: src/main.c:184 src/query.c:530 dpkg-deb/main.c:162 dpkg-split/main.c:145
 #, c-format
 msgid "conflicting actions --%s and --%s"
 msgstr "actions conflictuelles --%s et --%s"
@@ -2658,7 +2659,7 @@ msgstr "impossible d'ouvrir le flux d'entr
 msgid "unexpected eof before end of line %d"
 msgstr "EOF inattendu avant la fin de la ligne %d"
 
-#: src/main.c:557 src/main.c:572 src/query.c:561 dpkg-deb/main.c:184
+#: src/main.c:557 src/main.c:572 src/query.c:565 dpkg-deb/main.c:184
 #: dpkg-split/main.c:157
 msgid "need an action option"
 msgstr "requiert une option d'action"
@@ -2668,7 +2669,7 @@ msgstr "requiert une option d'action"
 msgid "--%s --pending does not take any non-option arguments"
 msgstr "--%s --pending ne prend pas d'argument non optionnel"
 
-#: src/packages.c:109 src/query.c:317
+#: src/packages.c:109 src/query.c:321
 #, c-format
 msgid "--%s needs at least one package name argument"
 msgstr "--%s a besoin d'au moins un nom de paquet comme argument"
@@ -2981,80 +2982,80 @@ msgstr "Version"
 msgid "Description"
 msgstr "Description"
 
-#: src/query.c:220 src/query.c:442 src/select.c:80
+#: src/query.c:218 src/query.c:446 src/select.c:80
 #, c-format
 msgid "No packages found matching %s.\n"
 msgstr "Aucun paquet ne correspond à %s.\n"
 
-#: src/query.c:236
+#: src/query.c:240
 #, c-format
 msgid "diversion by %s"
 msgstr "détourné par %s"
 
-#: src/query.c:237
+#: src/query.c:241
 #, c-format
 msgid "local diversion"
 msgstr "détournement local"
 
-#: src/query.c:238
+#: src/query.c:242
 msgid "to"
 msgstr "à"
 
-#: src/query.c:238
+#: src/query.c:242
 msgid "from"
 msgstr "de"
 
-#: src/query.c:271
+#: src/query.c:275
 msgid "--search needs at least one file name pattern argument"
 msgstr "--search a besoin d'au moins un motif de nom de fichier comme argument"
 
-#: src/query.c:299
+#: src/query.c:303
 #, c-format
 msgid "dpkg: %s not found.\n"
 msgstr "dpkg : %s introuvable.\n"
 
-#: src/query.c:337
+#: src/query.c:341
 #, c-format
 msgid "Package `%s' is not installed and no info is available.\n"
 msgstr ""
 "Le paquet « %s » n'est pas installé et aucune information n'est disponible.\n"
 
-#: src/query.c:346
+#: src/query.c:350
 #, c-format
 msgid "Package `%s' is not available.\n"
 msgstr "Le paquet « %s » n'est pas disponible.\n"
 
-#: src/query.c:356
+#: src/query.c:360
 #, c-format
 msgid "Package `%s' is not installed.\n"
 msgstr "Le paquet « %s » n'est pas installé.\n"
 
-#: src/query.c:365
+#: src/query.c:369
 #, c-format
 msgid "Package `%s' does not contain any files (!)\n"
 msgstr "Le paquet « %s » ne contient aucun fichier (!)\n"
 
-#: src/query.c:371
+#: src/query.c:375
 #, c-format
 msgid "locally diverted"
 msgstr "détourné localement"
 
-#: src/query.c:372
+#: src/query.c:376
 #, c-format
 msgid "package diverts others"
 msgstr "paquet détournant les autres"
 
-#: src/query.c:373
+#: src/query.c:377
 #, c-format
 msgid "diverted by %s"
 msgstr "détourné par %s"
 
-#: src/query.c:374
+#: src/query.c:378
 #, c-format
 msgid " to: %s\n"
 msgstr " vers : %s\n"
 
-#: src/query.c:393
+#: src/query.c:397
 msgid ""
 "Use dpkg --info (= dpkg-deb --info) to examine archive files,\n"
 "and dpkg --contents (= dpkg-deb --contents) to list their contents.\n"
@@ -3063,20 +3064,20 @@ msgstr ""
 "archives, et dpkg --contents (= dpkg-deb --contents) pour afficher leur\n"
 "contenu.\n"
 
-#: src/query.c:454 dpkg-deb/main.c:46
+#: src/query.c:458 dpkg-deb/main.c:46
 msgid "Debian `"
 msgstr "Debian « "
 
-#: src/query.c:456
+#: src/query.c:460
 msgid "' package management program query tool\n"
 msgstr " » outil d'interrogation du programme de gestion de paquets\n"
 
-#: src/query.c:468
+#: src/query.c:472
 #, c-format
 msgid "Usage: "
 msgstr "Usage : "
 
-#: src/query.c:469
+#: src/query.c:473
 #, c-format
 msgid ""
 " [<option>] <command>\n"
@@ -3133,7 +3134,7 @@ 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:496
+#: src/query.c:500
 msgid ""
 "Use --help for help about querying packages;\n"
 "Use --licence for copyright licence and lack of warranty (GNU GPL).\n"
@@ -5623,6 +5624,7 @@ msgstr ""
 "Voir dpkg-deb --license pour plus de détails.\n"
 
 #: dpkg-deb/main.c:58
+#, fuzzy
 msgid ""
 "Command:\n"
 "  -b|--build <directory> [<deb>]    build an archive.\n"
@@ -5662,8 +5664,8 @@ msgid ""
 "   case left alignment will be used. \n"
 "\n"
 "Use `dpkg' to install and remove packages from your system, or\n"
-"`dselect' for user-friendly package management.  Packages unpacked\n"
-"using `dpkg-deb --extract' will be incorrectly installed !\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"


+ 33 - 31
po/gl.po

@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dpkg 1.9.0\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2005-03-18 16:22+0000\n"
+"POT-Creation-Date: 2005-03-21 03:11+0000\n"
 "PO-Revision-Date: 2005-02-05 13:10+0100\n"
 "Last-Translator: Héctor Fernández López <trorrr@yahoo.es>\n"
 "Language-Team: Galician <trasno@ceu.fi.udc.es>\n"
@@ -2135,7 +2135,7 @@ msgstr "Administrador de paquetes `"
 msgid "' package management program version "
 msgstr "' de Debian GNU/Linux, versión "
 
-#: src/main.c:48 src/query.c:458
+#: src/main.c:48 src/query.c:462
 msgid ""
 "This is free software; see the GNU General Public Licence version 2 or\n"
 "later for copying conditions.  There is NO warranty.\n"
@@ -2145,7 +2145,7 @@ msgstr ""
 "posterior para condicións de copia. Non hai NINGUNHA garantía.\n"
 "Vexa "
 
-#: src/main.c:50 src/query.c:460
+#: src/main.c:50 src/query.c:464
 msgid " --licence for copyright and license details.\n"
 msgstr "--license para o copyright e información da licencia\n"
 
@@ -2213,7 +2213,7 @@ msgid ""
 " 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"
+"Use `dselect' or `aptitude' for user-friendly package management.\n"
 msgstr ""
 "Modo de emprego: \n"
 "  dpkg -i|--install      <ficheiro .deb>  ... | -R|--recursive <dir> ...\n"
@@ -2297,9 +2297,10 @@ msgstr ""
 "Use `dselect' ou \"aptitude\" para unha xestión de paquetes máis amigable.\n"
 
 #: src/main.c:119
+#, fuzzy
 msgid ""
 "Type dpkg --help for help about installing and deinstalling packages [*];\n"
-"Use dselect for user-friendly package management;\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"
@@ -2321,7 +2322,7 @@ msgstr ""
 "As opcións marcadas con [*] producen unha saída extensa - ¡ fíltrea con\n"
 "`less' ou `more' !"
 
-#: src/main.c:184 src/query.c:526 dpkg-deb/main.c:162 dpkg-split/main.c:145
+#: src/main.c:184 src/query.c:530 dpkg-deb/main.c:162 dpkg-split/main.c:145
 #, c-format
 msgid "conflicting actions --%s and --%s"
 msgstr "as accións --%s e --%s están en conflicto"
@@ -2514,7 +2515,7 @@ msgstr "non se puido abrir `%i' en modo fluxo"
 msgid "unexpected eof before end of line %d"
 msgstr "eof inesperado antes do fin da liña %d"
 
-#: src/main.c:557 src/main.c:572 src/query.c:561 dpkg-deb/main.c:184
+#: src/main.c:557 src/main.c:572 src/query.c:565 dpkg-deb/main.c:184
 #: dpkg-split/main.c:157
 msgid "need an action option"
 msgstr "é necesaria unha opción de acción"
@@ -2524,7 +2525,7 @@ msgstr "
 msgid "--%s --pending does not take any non-option arguments"
 msgstr "--%s --pending non leva argumentos que non sexan opcións"
 
-#: src/packages.c:109 src/query.c:317
+#: src/packages.c:109 src/query.c:321
 #, c-format
 msgid "--%s needs at least one package name argument"
 msgstr "--%s precisa polo menos dun nome de paquete como argumento"
@@ -2831,80 +2832,80 @@ msgstr "Versi
 msgid "Description"
 msgstr "Descripción"
 
-#: src/query.c:220 src/query.c:442 src/select.c:80
+#: src/query.c:218 src/query.c:446 src/select.c:80
 #, c-format
 msgid "No packages found matching %s.\n"
 msgstr "Non se atoparon paquetes que se correspondan con %s.\n"
 
-#: src/query.c:236
+#: src/query.c:240
 #, c-format
 msgid "diversion by %s"
 msgstr "desviación por %s"
 
-#: src/query.c:237
+#: src/query.c:241
 #, c-format
 msgid "local diversion"
 msgstr "desviación local"
 
-#: src/query.c:238
+#: src/query.c:242
 msgid "to"
 msgstr "a"
 
-#: src/query.c:238
+#: src/query.c:242
 msgid "from"
 msgstr "desde"
 
-#: src/query.c:271
+#: src/query.c:275
 msgid "--search needs at least one file name pattern argument"
 msgstr ""
 "--search precisa polo menos dun patrón de nome de ficheiro como argumento"
 
-#: src/query.c:299
+#: src/query.c:303
 #, c-format
 msgid "dpkg: %s not found.\n"
 msgstr "dpkg: non se atopou %s.\n"
 
-#: src/query.c:337
+#: src/query.c:341
 #, c-format
 msgid "Package `%s' is not installed and no info is available.\n"
 msgstr "O paquete `%s' non está instalado e non hai información dispoñible.\n"
 
-#: src/query.c:346
+#: src/query.c:350
 #, c-format
 msgid "Package `%s' is not available.\n"
 msgstr "O paquete `%s' non está dispoñible.\n"
 
-#: src/query.c:356
+#: src/query.c:360
 #, c-format
 msgid "Package `%s' is not installed.\n"
 msgstr "O paquete `%s' non está instalado.\n"
 
-#: src/query.c:365
+#: src/query.c:369
 #, c-format
 msgid "Package `%s' does not contain any files (!)\n"
 msgstr "O paquete `%s' non contén ningún ficheiro (!)\n"
 
-#: src/query.c:371
+#: src/query.c:375
 #, c-format
 msgid "locally diverted"
 msgstr "desviado localmente"
 
-#: src/query.c:372
+#: src/query.c:376
 #, c-format
 msgid "package diverts others"
 msgstr "o paquete desvía a outros"
 
-#: src/query.c:373
+#: src/query.c:377
 #, c-format
 msgid "diverted by %s"
 msgstr "desviado por %s"
 
-#: src/query.c:374
+#: src/query.c:378
 #, c-format
 msgid " to: %s\n"
 msgstr " a: %s\n"
 
-#: src/query.c:393
+#: src/query.c:397
 msgid ""
 "Use dpkg --info (= dpkg-deb --info) to examine archive files,\n"
 "and dpkg --contents (= dpkg-deb --contents) to list their contents.\n"
@@ -2912,20 +2913,20 @@ msgstr ""
 "Usa dpkg --info (= dpkg-deb --info) para examinar os ficheiros,\n"
 "e dpkg --contents (= dpkg-deb --contents) para lista-lo seu contido.\n"
 
-#: src/query.c:454 dpkg-deb/main.c:46
+#: src/query.c:458 dpkg-deb/main.c:46
 msgid "Debian `"
 msgstr "Administrador de paquetes `"
 
-#: src/query.c:456
+#: src/query.c:460
 msgid "' package management program query tool\n"
 msgstr "' de Debian\n"
 
-#: src/query.c:468
+#: src/query.c:472
 #, c-format
 msgid "Usage: "
 msgstr "Uso: "
 
-#: src/query.c:469
+#: src/query.c:473
 #, fuzzy, c-format
 msgid ""
 " [<option>] <command>\n"
@@ -2981,7 +2982,7 @@ msgstr ""
 "  sintaxe ${var[ancho]}.  Os campos vanse alinear á dereita a non ser que o\n"
 "  ancho sexa negativo, que se alinearán á esquerda.\n"
 
-#: src/query.c:496
+#: src/query.c:500
 msgid ""
 "Use --help for help about querying packages;\n"
 "Use --licence for copyright licence and lack of warranty (GNU GPL).\n"
@@ -5426,6 +5427,7 @@ msgstr ""
 "Vexa dpkg --licence para o copyright e os detalles da licencia.\n"
 
 #: dpkg-deb/main.c:58
+#, fuzzy
 msgid ""
 "Command:\n"
 "  -b|--build <directory> [<deb>]    build an archive.\n"
@@ -5465,8 +5467,8 @@ msgid ""
 "   case left alignment will be used. \n"
 "\n"
 "Use `dpkg' to install and remove packages from your system, or\n"
-"`dselect' for user-friendly package management.  Packages unpacked\n"
-"using `dpkg-deb --extract' will be incorrectly installed !\n"
+"`dselect' or `aptitude' for user-friendly package management.  Packages\n"
+"unpacked using `dpkg-deb --extract' will be incorrectly installed !\n"
 msgstr ""
 "Modo de empleo:\n"
 "  -b|--build <directorio> [<deb>]   Constrúe un arquivo.\n"


+ 31 - 31
po/he.po

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dpkg\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2005-03-18 16:22+0000\n"
+"POT-Creation-Date: 2005-03-21 03:11+0000\n"
 "PO-Revision-Date: 2004-10-07 03:01+0200\n"
 "Last-Translator: Lior Kaplan <webmaster@guides.co.il>\n"
 "Language-Team: English <en@li.org>\n"
@@ -1989,14 +1989,14 @@ msgstr ""
 msgid "' package management program version "
 msgstr ""
 
-#: src/main.c:48 src/query.c:458
+#: src/main.c:48 src/query.c:462
 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:460
+#: src/main.c:50 src/query.c:464
 msgid " --licence for copyright and license details.\n"
 msgstr ""
 
@@ -2064,13 +2064,13 @@ msgid ""
 " 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"
+"Use `dselect' or `aptitude' for user-friendly package management.\n"
 msgstr ""
 
 #: src/main.c:119
 msgid ""
 "Type dpkg --help for help about installing and deinstalling packages [*];\n"
-"Use dselect for user-friendly package management;\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"
@@ -2081,7 +2081,7 @@ msgid ""
 "`more' !"
 msgstr ""
 
-#: src/main.c:184 src/query.c:526 dpkg-deb/main.c:162 dpkg-split/main.c:145
+#: src/main.c:184 src/query.c:530 dpkg-deb/main.c:162 dpkg-split/main.c:145
 #, c-format
 msgid "conflicting actions --%s and --%s"
 msgstr ""
@@ -2217,7 +2217,7 @@ msgstr ""
 msgid "unexpected eof before end of line %d"
 msgstr ""
 
-#: src/main.c:557 src/main.c:572 src/query.c:561 dpkg-deb/main.c:184
+#: src/main.c:557 src/main.c:572 src/query.c:565 dpkg-deb/main.c:184
 #: dpkg-split/main.c:157
 msgid "need an action option"
 msgstr ""
@@ -2227,7 +2227,7 @@ msgstr ""
 msgid "--%s --pending does not take any non-option arguments"
 msgstr ""
 
-#: src/packages.c:109 src/query.c:317
+#: src/packages.c:109 src/query.c:321
 #, c-format
 msgid "--%s needs at least one package name argument"
 msgstr ""
@@ -2508,98 +2508,98 @@ msgstr ""
 msgid "Description"
 msgstr ""
 
-#: src/query.c:220 src/query.c:442 src/select.c:80
+#: src/query.c:218 src/query.c:446 src/select.c:80
 #, c-format
 msgid "No packages found matching %s.\n"
 msgstr ""
 
-#: src/query.c:236
+#: src/query.c:240
 #, c-format
 msgid "diversion by %s"
 msgstr ""
 
-#: src/query.c:237
+#: src/query.c:241
 #, c-format
 msgid "local diversion"
 msgstr ""
 
-#: src/query.c:238
+#: src/query.c:242
 msgid "to"
 msgstr ""
 
-#: src/query.c:238
+#: src/query.c:242
 msgid "from"
 msgstr ""
 
-#: src/query.c:271
+#: src/query.c:275
 msgid "--search needs at least one file name pattern argument"
 msgstr ""
 
-#: src/query.c:299
+#: src/query.c:303
 #, c-format
 msgid "dpkg: %s not found.\n"
 msgstr ""
 
-#: src/query.c:337
+#: src/query.c:341
 #, c-format
 msgid "Package `%s' is not installed and no info is available.\n"
 msgstr ""
 
-#: src/query.c:346
+#: src/query.c:350
 #, c-format
 msgid "Package `%s' is not available.\n"
 msgstr ""
 
-#: src/query.c:356
+#: src/query.c:360
 #, c-format
 msgid "Package `%s' is not installed.\n"
 msgstr ""
 
-#: src/query.c:365
+#: src/query.c:369
 #, c-format
 msgid "Package `%s' does not contain any files (!)\n"
 msgstr ""
 
-#: src/query.c:371
+#: src/query.c:375
 #, c-format
 msgid "locally diverted"
 msgstr ""
 
-#: src/query.c:372
+#: src/query.c:376
 #, c-format
 msgid "package diverts others"
 msgstr ""
 
-#: src/query.c:373
+#: src/query.c:377
 #, c-format
 msgid "diverted by %s"
 msgstr ""
 
-#: src/query.c:374
+#: src/query.c:378
 #, c-format
 msgid " to: %s\n"
 msgstr ""
 
-#: src/query.c:393
+#: src/query.c:397
 msgid ""
 "Use dpkg --info (= dpkg-deb --info) to examine archive files,\n"
 "and dpkg --contents (= dpkg-deb --contents) to list their contents.\n"
 msgstr ""
 
-#: src/query.c:454 dpkg-deb/main.c:46
+#: src/query.c:458 dpkg-deb/main.c:46
 msgid "Debian `"
 msgstr ""
 
-#: src/query.c:456
+#: src/query.c:460
 msgid "' package management program query tool\n"
 msgstr ""
 
-#: src/query.c:468
+#: src/query.c:472
 #, c-format
 msgid "Usage: "
 msgstr ""
 
-#: src/query.c:469
+#: src/query.c:473
 #, c-format
 msgid ""
 " [<option>] <command>\n"
@@ -2628,7 +2628,7 @@ msgid ""
 "   case left aligenment will be used. \n"
 msgstr ""
 
-#: src/query.c:496
+#: src/query.c:500
 msgid ""
 "Use --help for help about querying packages;\n"
 "Use --licence for copyright licence and lack of warranty (GNU GPL).\n"
@@ -4795,8 +4795,8 @@ msgid ""
 "   case left alignment will be used. \n"
 "\n"
 "Use `dpkg' to install and remove packages from your system, or\n"
-"`dselect' for user-friendly package management.  Packages unpacked\n"
-"using `dpkg-deb --extract' will be incorrectly installed !\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


+ 31 - 31
po/id.po

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dpkg\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2005-03-18 16:22+0000\n"
+"POT-Creation-Date: 2005-03-21 03:11+0000\n"
 "PO-Revision-Date: 2005-01-29 18:40+0700\n"
 "Last-Translator: Arief S Fitrianto <arief@gurame.fisika.ui.ac.id>\n"
 "Language-Team: Debian Indonesia L10N Team <debian-l10n-id@gurame.fisika.ui."
@@ -2076,14 +2076,14 @@ msgstr "Debian GNU/Linux `"
 msgid "' package management program version "
 msgstr ""
 
-#: src/main.c:48 src/query.c:458
+#: src/main.c:48 src/query.c:462
 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:460
+#: src/main.c:50 src/query.c:464
 msgid " --licence for copyright and license details.\n"
 msgstr ""
 
@@ -2151,13 +2151,13 @@ msgid ""
 " 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"
+"Use `dselect' or `aptitude' for user-friendly package management.\n"
 msgstr ""
 
 #: src/main.c:119
 msgid ""
 "Type dpkg --help for help about installing and deinstalling packages [*];\n"
-"Use dselect for user-friendly package management;\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"
@@ -2168,7 +2168,7 @@ msgid ""
 "`more' !"
 msgstr ""
 
-#: src/main.c:184 src/query.c:526 dpkg-deb/main.c:162 dpkg-split/main.c:145
+#: src/main.c:184 src/query.c:530 dpkg-deb/main.c:162 dpkg-split/main.c:145
 #, c-format
 msgid "conflicting actions --%s and --%s"
 msgstr "aksi berbenturan --%s dan --%s"
@@ -2304,7 +2304,7 @@ msgstr "tidak dapat membuka `%i' untuk stream"
 msgid "unexpected eof before end of line %d"
 msgstr ""
 
-#: src/main.c:557 src/main.c:572 src/query.c:561 dpkg-deb/main.c:184
+#: src/main.c:557 src/main.c:572 src/query.c:565 dpkg-deb/main.c:184
 #: dpkg-split/main.c:157
 msgid "need an action option"
 msgstr "butuh suatu pilihan aksi"
@@ -2314,7 +2314,7 @@ msgstr "butuh suatu pilihan aksi"
 msgid "--%s --pending does not take any non-option arguments"
 msgstr ""
 
-#: src/packages.c:109 src/query.c:317
+#: src/packages.c:109 src/query.c:321
 #, c-format
 msgid "--%s needs at least one package name argument"
 msgstr "--%s butuh sedikitnya satu argumen nama paket"
@@ -2595,98 +2595,98 @@ msgstr "Versi"
 msgid "Description"
 msgstr "Keterangan"
 
-#: src/query.c:220 src/query.c:442 src/select.c:80
+#: src/query.c:218 src/query.c:446 src/select.c:80
 #, c-format
 msgid "No packages found matching %s.\n"
 msgstr "Tidak ada paket yang cocok dengan %s. \n"
 
-#: src/query.c:236
+#: src/query.c:240
 #, c-format
 msgid "diversion by %s"
 msgstr "Dialihkan oleh %s"
 
-#: src/query.c:237
+#: src/query.c:241
 #, c-format
 msgid "local diversion"
 msgstr "Pengalihan lokal"
 
-#: src/query.c:238
+#: src/query.c:242
 msgid "to"
 msgstr "ke"
 
-#: src/query.c:238
+#: src/query.c:242
 msgid "from"
 msgstr "dari"
 
-#: src/query.c:271
+#: src/query.c:275
 msgid "--search needs at least one file name pattern argument"
 msgstr ""
 
-#: src/query.c:299
+#: src/query.c:303
 #, c-format
 msgid "dpkg: %s not found.\n"
 msgstr "dpkg: %s tidak ada. \n"
 
-#: src/query.c:337
+#: src/query.c:341
 #, c-format
 msgid "Package `%s' is not installed and no info is available.\n"
 msgstr ""
 
-#: src/query.c:346
+#: src/query.c:350
 #, c-format
 msgid "Package `%s' is not available.\n"
 msgstr "Paket `%s' tidak tersedia. \n"
 
-#: src/query.c:356
+#: src/query.c:360
 #, c-format
 msgid "Package `%s' is not installed.\n"
 msgstr "Paket `%s' tidak terpasang. \n"
 
-#: src/query.c:365
+#: src/query.c:369
 #, c-format
 msgid "Package `%s' does not contain any files (!)\n"
 msgstr ""
 
-#: src/query.c:371
+#: src/query.c:375
 #, c-format
 msgid "locally diverted"
 msgstr "dialihkan secara lokal"
 
-#: src/query.c:372
+#: src/query.c:376
 #, c-format
 msgid "package diverts others"
 msgstr "paket mengalihkan yang lain"
 
-#: src/query.c:373
+#: src/query.c:377
 #, c-format
 msgid "diverted by %s"
 msgstr "Dialihkan oleh %s"
 
-#: src/query.c:374
+#: src/query.c:378
 #, c-format
 msgid " to: %s\n"
 msgstr "  ke: %s \n"
 
-#: src/query.c:393
+#: src/query.c:397
 msgid ""
 "Use dpkg --info (= dpkg-deb --info) to examine archive files,\n"
 "and dpkg --contents (= dpkg-deb --contents) to list their contents.\n"
 msgstr ""
 
-#: src/query.c:454 dpkg-deb/main.c:46
+#: src/query.c:458 dpkg-deb/main.c:46
 msgid "Debian `"
 msgstr "Debian `"
 
-#: src/query.c:456
+#: src/query.c:460
 msgid "' package management program query tool\n"
 msgstr ""
 
-#: src/query.c:468
+#: src/query.c:472
 #, c-format
 msgid "Usage: "
 msgstr "Cara Pakai: "
 
-#: src/query.c:469
+#: src/query.c:473
 #, c-format
 msgid ""
 " [<option>] <command>\n"
@@ -2715,7 +2715,7 @@ msgid ""
 "   case left aligenment will be used. \n"
 msgstr ""
 
-#: src/query.c:496
+#: src/query.c:500
 msgid ""
 "Use --help for help about querying packages;\n"
 "Use --licence for copyright licence and lack of warranty (GNU GPL).\n"
@@ -4884,8 +4884,8 @@ msgid ""
 "   case left alignment will be used. \n"
 "\n"
 "Use `dpkg' to install and remove packages from your system, or\n"
-"`dselect' for user-friendly package management.  Packages unpacked\n"
-"using `dpkg-deb --extract' will be incorrectly installed !\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


+ 33 - 31
po/it.po

@@ -41,7 +41,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dpkg 1.10.22\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2005-03-18 16:22+0000\n"
+"POT-Creation-Date: 2005-03-21 03:11+0000\n"
 "PO-Revision-Date: 2005-01-06 17:59+0100\n"
 "Last-Translator: Stefano Canepa <sc@linux.it>\n"
 "Language-Team: italian <debian-l10n-italian@debian.org>\n"
@@ -2202,7 +2202,7 @@ msgstr "Debian GNU/Linux `"
 msgid "' package management program version "
 msgstr "' programma di gestione dei pacchetti versione "
 
-#: src/main.c:48 src/query.c:458
+#: src/main.c:48 src/query.c:462
 msgid ""
 "This is free software; see the GNU General Public Licence version 2 or\n"
 "later for copying conditions.  There is NO warranty.\n"
@@ -2212,7 +2212,7 @@ msgstr ""
 "o successiva per le condizioni di copia. NON c'è alcuna garanzia.\n"
 "Vedi "
 
-#: src/main.c:50 src/query.c:460
+#: src/main.c:50 src/query.c:464
 msgid " --licence for copyright and license details.\n"
 msgstr " --licence per il copyright ed i dettagli sulla licenza.\n"
 
@@ -2280,7 +2280,7 @@ msgid ""
 " 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"
+"Use `dselect' or `aptitude' for user-friendly package management.\n"
 msgstr ""
 "Uso: \n"
 "  dpkg -i|--install      <nome file .deb> ... | -R|--recursive <dir> ...\n"
@@ -2362,9 +2362,10 @@ msgstr ""
 "dei pacchetti.\n"
 
 #: src/main.c:119
+#, fuzzy
 msgid ""
 "Type dpkg --help for help about installing and deinstalling packages [*];\n"
-"Use dselect for user-friendly package management;\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"
@@ -2386,7 +2387,7 @@ 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:526 dpkg-deb/main.c:162 dpkg-split/main.c:145
+#: src/main.c:184 src/query.c:530 dpkg-deb/main.c:162 dpkg-split/main.c:145
 #, c-format
 msgid "conflicting actions --%s and --%s"
 msgstr "le azioni --%s e --%s sono in conflitto"
@@ -2589,7 +2590,7 @@ msgstr "impossibile aprire `%i' per ricevere il flusso"
 msgid "unexpected eof before end of line %d"
 msgstr "eof inaspettato prima della fine della linea %d"
 
-#: src/main.c:557 src/main.c:572 src/query.c:561 dpkg-deb/main.c:184
+#: src/main.c:557 src/main.c:572 src/query.c:565 dpkg-deb/main.c:184
 #: dpkg-split/main.c:157
 msgid "need an action option"
 msgstr "è necessaria una opzione che indichi che azione svolgere"
@@ -2599,7 +2600,7 @@ msgstr "è necessaria una opzione che indichi che azione svolgere"
 msgid "--%s --pending does not take any non-option arguments"
 msgstr "--%s --pending non accetta alcun parametro che non sia un'opzione"
 
-#: src/packages.c:109 src/query.c:317
+#: src/packages.c:109 src/query.c:321
 #, c-format
 msgid "--%s needs at least one package name argument"
 msgstr "--%s richiede il nome di almeno un pacchetto come parametro"
@@ -2909,80 +2910,80 @@ msgstr "Versione"
 msgid "Description"
 msgstr "Descrizione"
 
-#: src/query.c:220 src/query.c:442 src/select.c:80
+#: src/query.c:218 src/query.c:446 src/select.c:80
 #, c-format
 msgid "No packages found matching %s.\n"
 msgstr "Nessun pacchetto corrisponde a %s.\n"
 
-#: src/query.c:236
+#: src/query.c:240
 #, c-format
 msgid "diversion by %s"
 msgstr "diversificato da %s"
 
-#: src/query.c:237
+#: src/query.c:241
 #, c-format
 msgid "local diversion"
 msgstr "diversione locale"
 
-#: src/query.c:238
+#: src/query.c:242
 msgid "to"
 msgstr "a"
 
-#: src/query.c:238
+#: src/query.c:242
 msgid "from"
 msgstr "da"
 
-#: src/query.c:271
+#: src/query.c:275
 msgid "--search needs at least one file name pattern argument"
 msgstr "--search richiede almeno un modello di nome come parametro"
 
-#: src/query.c:299
+#: src/query.c:303
 #, c-format
 msgid "dpkg: %s not found.\n"
 msgstr "dpkg: %s non trovato.\n"
 
-#: src/query.c:337
+#: src/query.c:341
 #, c-format
 msgid "Package `%s' is not installed and no info is available.\n"
 msgstr ""
 "Il pacchetto `%s' non è installato e non è disponibile alcuna informazione.\n"
 
-#: src/query.c:346
+#: src/query.c:350
 #, c-format
 msgid "Package `%s' is not available.\n"
 msgstr "Il pacchetto `%s' non è disponibile.\n"
 
-#: src/query.c:356
+#: src/query.c:360
 #, c-format
 msgid "Package `%s' is not installed.\n"
 msgstr "Il pacchetto `%s' non è installato.\n"
 
-#: src/query.c:365
+#: src/query.c:369
 #, c-format
 msgid "Package `%s' does not contain any files (!)\n"
 msgstr "Il pacchetto `%s' non contiene nessun file (!)\n"
 
-#: src/query.c:371
+#: src/query.c:375
 #, c-format
 msgid "locally diverted"
 msgstr "diversificato localmente"
 
-#: src/query.c:372
+#: src/query.c:376
 #, c-format
 msgid "package diverts others"
 msgstr "diversifica altri"
 
-#: src/query.c:373
+#: src/query.c:377
 #, c-format
 msgid "diverted by %s"
 msgstr "diversificato da %s"
 
-#: src/query.c:374
+#: src/query.c:378
 #, c-format
 msgid " to: %s\n"
 msgstr " a: %s\n"
 
-#: src/query.c:393
+#: src/query.c:397
 msgid ""
 "Use dpkg --info (= dpkg-deb --info) to examine archive files,\n"
 "and dpkg --contents (= dpkg-deb --contents) to list their contents.\n"
@@ -2990,20 +2991,20 @@ 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:454 dpkg-deb/main.c:46
+#: src/query.c:458 dpkg-deb/main.c:46
 msgid "Debian `"
 msgstr "Debian `"
 
-#: src/query.c:456
+#: src/query.c:460
 msgid "' package management program query tool\n"
 msgstr "' strumento per esaminare la situazione dei pacchetti\n"
 
-#: src/query.c:468
+#: src/query.c:472
 #, c-format
 msgid "Usage: "
 msgstr "Uso: "
 
-#: src/query.c:469
+#: src/query.c:473
 #, fuzzy, c-format
 msgid ""
 " [<option>] <command>\n"
@@ -3056,7 +3057,7 @@ 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:496
+#: src/query.c:500
 msgid ""
 "Use --help for help about querying packages;\n"
 "Use --licence for copyright licence and lack of warranty (GNU GPL).\n"
@@ -5524,6 +5525,7 @@ msgstr ""
 "Vedi dpkg-deb --licence per i dettagli.\n"
 
 #: dpkg-deb/main.c:58
+#, fuzzy
 msgid ""
 "Command:\n"
 "  -b|--build <directory> [<deb>]    build an archive.\n"
@@ -5563,8 +5565,8 @@ msgid ""
 "   case left alignment will be used. \n"
 "\n"
 "Use `dpkg' to install and remove packages from your system, or\n"
-"`dselect' for user-friendly package management.  Packages unpacked\n"
-"using `dpkg-deb --extract' will be incorrectly installed !\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"


+ 33 - 31
po/ja.po

@@ -19,7 +19,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 1.10.23\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2005-03-18 16:22+0000\n"
+"POT-Creation-Date: 2005-03-21 03:11+0000\n"
 "PO-Revision-Date: 2004-12-31 16:22+0900\n"
 "Last-Translator: Kenshi Muto <kmuto@debian.org>\n"
 "Language-Team: Debian Japanease List <debian-japanese@lists.debian.org>\n"
@@ -2138,7 +2138,7 @@ msgstr "Debian GNU/Linux `"
 msgid "' package management program version "
 msgstr "' パッケージ管理プログラム バージョン "
 
-#: src/main.c:48 src/query.c:458
+#: src/main.c:48 src/query.c:462
 msgid ""
 "This is free software; see the GNU General Public Licence version 2 or\n"
 "later for copying conditions.  There is NO warranty.\n"
@@ -2148,7 +2148,7 @@ msgstr ""
 "バージョン 2 もしくはそれ以降を参照してください。このソフトウェアは\n"
 "無保証です。"
 
-#: src/main.c:50 src/query.c:460
+#: src/main.c:50 src/query.c:464
 msgid " --licence for copyright and license details.\n"
 msgstr ""
 "コピーライトとライセンスに関する詳細は --licence を参照してください。\n"
@@ -2217,7 +2217,7 @@ msgid ""
 " 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"
+"Use `dselect' or `aptitude' for user-friendly package management.\n"
 msgstr ""
 "使用方法: \n"
 "  dpkg -i|--install      <.deb ファイル名> ... | -R|--recursive <ディレクトリ"
@@ -2295,9 +2295,10 @@ msgstr ""
 "う。\n"
 
 #: src/main.c:119
+#, fuzzy
 msgid ""
 "Type dpkg --help for help about installing and deinstalling packages [*];\n"
-"Use dselect for user-friendly package management;\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"
@@ -2317,7 +2318,7 @@ msgstr ""
 "[*]のある物は大量の情報が出力されます。パイプを使い`less'や`more'で見ましょ"
 "う!"
 
-#: src/main.c:184 src/query.c:526 dpkg-deb/main.c:162 dpkg-split/main.c:145
+#: src/main.c:184 src/query.c:530 dpkg-deb/main.c:162 dpkg-split/main.c:145
 #, c-format
 msgid "conflicting actions --%s and --%s"
 msgstr "アクション --%s と --%s が競合します。"
@@ -2504,7 +2505,7 @@ msgstr "`%i' 
 msgid "unexpected eof before end of line %d"
 msgstr "%d 行目の行末までに予期しない eof があります。"
 
-#: src/main.c:557 src/main.c:572 src/query.c:561 dpkg-deb/main.c:184
+#: src/main.c:557 src/main.c:572 src/query.c:565 dpkg-deb/main.c:184
 #: dpkg-split/main.c:157
 msgid "need an action option"
 msgstr "アクションを指定するオプションが必要です。"
@@ -2514,7 +2515,7 @@ msgstr "
 msgid "--%s --pending does not take any non-option arguments"
 msgstr "--%s --pending はオプション以外の引数を取りません。"
 
-#: src/packages.c:109 src/query.c:317
+#: src/packages.c:109 src/query.c:321
 #, c-format
 msgid "--%s needs at least one package name argument"
 msgstr "--%s は引数に少なくとも 1 つのパッケージ名が必要です。"
@@ -2825,79 +2826,79 @@ msgstr "
 msgid "Description"
 msgstr "説明"
 
-#: src/query.c:220 src/query.c:442 src/select.c:80
+#: src/query.c:218 src/query.c:446 src/select.c:80
 #, c-format
 msgid "No packages found matching %s.\n"
 msgstr "%s に一致するパッケージが見つかりません。\n"
 
-#: src/query.c:236
+#: src/query.c:240
 #, c-format
 msgid "diversion by %s"
 msgstr "%s による退避(diversion)"
 
-#: src/query.c:237
+#: src/query.c:241
 #, c-format
 msgid "local diversion"
 msgstr "ローカルな退避(diversion)"
 
-#: src/query.c:238
+#: src/query.c:242
 msgid "to"
 msgstr "次へ"
 
-#: src/query.c:238
+#: src/query.c:242
 msgid "from"
 msgstr "次から"
 
-#: src/query.c:271
+#: src/query.c:275
 msgid "--search needs at least one file name pattern argument"
 msgstr "--search は引数に少なくとも 1 つのファイル名パターンが必要です。"
 
-#: src/query.c:299
+#: src/query.c:303
 #, c-format
 msgid "dpkg: %s not found.\n"
 msgstr "dpkg: %s が見つかりません。\n"
 
-#: src/query.c:337
+#: src/query.c:341
 #, c-format
 msgid "Package `%s' is not installed and no info is available.\n"
 msgstr "パッケージ `%s' はまだインストールされておらず情報が利用不可能です。\n"
 
-#: src/query.c:346
+#: src/query.c:350
 #, c-format
 msgid "Package `%s' is not available.\n"
 msgstr "パッケージ `%s' はまだ利用可能でありません。\n"
 
-#: src/query.c:356
+#: src/query.c:360
 #, c-format
 msgid "Package `%s' is not installed.\n"
 msgstr "パッケージ `%s' はまだインストールされていません。\n"
 
-#: src/query.c:365
+#: src/query.c:369
 #, c-format
 msgid "Package `%s' does not contain any files (!)\n"
 msgstr "パッケージ `%s' はファイルを含んでいません。(!)\n"
 
-#: src/query.c:371
+#: src/query.c:375
 #, c-format
 msgid "locally diverted"
 msgstr "ローカルに退避(divert)された"
 
-#: src/query.c:372
+#: src/query.c:376
 #, c-format
 msgid "package diverts others"
 msgstr "他パッケージの同名ファイルは次の名に退避した"
 
-#: src/query.c:373
+#: src/query.c:377
 #, c-format
 msgid "diverted by %s"
 msgstr "%s により退避(divert)された"
 
-#: src/query.c:374
+#: src/query.c:378
 #, c-format
 msgid " to: %s\n"
 msgstr " %s へ\n"
 
-#: src/query.c:393
+#: src/query.c:397
 msgid ""
 "Use dpkg --info (= dpkg-deb --info) to examine archive files,\n"
 "and dpkg --contents (= dpkg-deb --contents) to list their contents.\n"
@@ -2906,20 +2907,20 @@ msgstr ""
 "その内容一覧を表示するには dpkg --contents (= dpkg-deb --contents)を使いま"
 "す。\n"
 
-#: src/query.c:454 dpkg-deb/main.c:46
+#: src/query.c:458 dpkg-deb/main.c:46
 msgid "Debian `"
 msgstr "Debian `"
 
-#: src/query.c:456
+#: src/query.c:460
 msgid "' package management program query tool\n"
 msgstr "' パッケージ管理プログラムクエリツール\n"
 
-#: src/query.c:468
+#: src/query.c:472
 #, c-format
 msgid "Usage: "
 msgstr "使い方: "
 
-#: src/query.c:469
+#: src/query.c:473
 #, fuzzy, c-format
 msgid ""
 " [<option>] <command>\n"
@@ -2971,7 +2972,7 @@ msgstr ""
 "  を挿入することで、含められます。width が負 (左寄せ) ではない場合\n"
 "  を除き、フィールドは右詰めされます。\n"
 
-#: src/query.c:496
+#: src/query.c:500
 msgid ""
 "Use --help for help about querying packages;\n"
 "Use --licence for copyright licence and lack of warranty (GNU GPL).\n"
@@ -5374,6 +5375,7 @@ msgstr ""
 "無保証です。詳細は dpkg-deb --licence を参照してください。\n"
 
 #: dpkg-deb/main.c:58
+#, fuzzy
 msgid ""
 "Command:\n"
 "  -b|--build <directory> [<deb>]    build an archive.\n"
@@ -5413,8 +5415,8 @@ msgid ""
 "   case left alignment will be used. \n"
 "\n"
 "Use `dpkg' to install and remove packages from your system, or\n"
-"`dselect' for user-friendly package management.  Packages unpacked\n"
-"using `dpkg-deb --extract' will be incorrectly installed !\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"


+ 33 - 31
po/ko.po

@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 1.10.22\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2005-03-18 16:22+0000\n"
+"POT-Creation-Date: 2005-03-21 03:11+0000\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"
@@ -2114,7 +2114,7 @@ msgstr "데비안 GNU/리눅스 `"
 msgid "' package management program version "
 msgstr "' 꾸러미 관리 프로그램 버전 "
 
-#: src/main.c:48 src/query.c:458
+#: src/main.c:48 src/query.c:462
 msgid ""
 "This is free software; see the GNU General Public Licence version 2 or\n"
 "later for copying conditions.  There is NO warranty.\n"
@@ -2124,7 +2124,7 @@ msgstr ""
 "혹은 그 이후 버전을 참고하십시오.  어떠한 보증도 하지 않습니다.\n"
 " "
 
-#: src/main.c:50 src/query.c:460
+#: src/main.c:50 src/query.c:464
 msgid " --licence for copyright and license details.\n"
 msgstr "저작권 및 라이선스 관련 정보는 dpkg --licence를 참고하십시오.\n"
 
@@ -2192,7 +2192,7 @@ msgid ""
 " 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"
+"Use `dselect' or `aptitude' for user-friendly package management.\n"
 msgstr ""
 "사용법: \n"
 "  dpkg -i|--install      <.deb 파일 이름> ... | -R|--recursive <디렉토리"
@@ -2260,9 +2260,10 @@ msgstr ""
 "사용하기 편리한 꾸러미 관리를 위해 `dselect'를 사용하십시오.\n"
 
 #: src/main.c:119
+#, fuzzy
 msgid ""
 "Type dpkg --help for help about installing and deinstalling packages [*];\n"
-"Use dselect for user-friendly package management;\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"
@@ -2281,7 +2282,7 @@ msgstr ""
 "[*]표로 표시된 옵션은 출력되는 내용이 많습니다. - `less'나 `more'를 이용하십"
 "시오!"
 
-#: src/main.c:184 src/query.c:526 dpkg-deb/main.c:162 dpkg-split/main.c:145
+#: src/main.c:184 src/query.c:530 dpkg-deb/main.c:162 dpkg-split/main.c:145
 #, c-format
 msgid "conflicting actions --%s and --%s"
 msgstr "--%s 명령과 --%s 명령은 충돌합니다"
@@ -2468,7 +2469,7 @@ msgstr "`%i' 파일디스크립터를 스트림으로 열 수 없습니다"
 msgid "unexpected eof before end of line %d"
 msgstr "%d번째 줄이 끝나기 전에 예상치 못하게 파일이 끝났습니다"
 
-#: src/main.c:557 src/main.c:572 src/query.c:561 dpkg-deb/main.c:184
+#: src/main.c:557 src/main.c:572 src/query.c:565 dpkg-deb/main.c:184
 #: dpkg-split/main.c:157
 msgid "need an action option"
 msgstr "명령 옵션이 필요합니다"
@@ -2478,7 +2479,7 @@ msgstr "명령 옵션이 필요합니다"
 msgid "--%s --pending does not take any non-option arguments"
 msgstr "--%s --pending에서는 옵션과 관계없는 인수를 받지 않습니다"
 
-#: src/packages.c:109 src/query.c:317
+#: src/packages.c:109 src/query.c:321
 #, c-format
 msgid "--%s needs at least one package name argument"
 msgstr "--%s 옵션은 적어도 하나의 꾸러미 이름 인수가 필요합니다"
@@ -2782,79 +2783,79 @@ msgstr "버전"
 msgid "Description"
 msgstr "설명"
 
-#: src/query.c:220 src/query.c:442 src/select.c:80
+#: src/query.c:218 src/query.c:446 src/select.c:80
 #, c-format
 msgid "No packages found matching %s.\n"
 msgstr "%s에 맞는 꾸러미가 없습니다.\n"
 
-#: src/query.c:236
+#: src/query.c:240
 #, c-format
 msgid "diversion by %s"
 msgstr "%s에 의해 전환"
 
-#: src/query.c:237
+#: src/query.c:241
 #, c-format
 msgid "local diversion"
 msgstr "로컬 전환"
 
-#: src/query.c:238
+#: src/query.c:242
 msgid "to"
 msgstr "다음으로:"
 
-#: src/query.c:238
+#: src/query.c:242
 msgid "from"
 msgstr "다음에서:"
 
-#: src/query.c:271
+#: src/query.c:275
 msgid "--search needs at least one file name pattern argument"
 msgstr "--search 옵션은 적어도 하나의 파일 이름 패턴 인수가 필요합니다"
 
-#: src/query.c:299
+#: src/query.c:303
 #, c-format
 msgid "dpkg: %s not found.\n"
 msgstr "dpkg: %s이(가) 없습니다.\n"
 
-#: src/query.c:337
+#: src/query.c:341
 #, c-format
 msgid "Package `%s' is not installed and no info is available.\n"
 msgstr "`%s' 꾸러미는 설치하지 않았으며 정보도 없습니다.\n"
 
-#: src/query.c:346
+#: src/query.c:350
 #, c-format
 msgid "Package `%s' is not available.\n"
 msgstr "`%s' 꾸러미는 사용할 수 없습니다.\n"
 
-#: src/query.c:356
+#: src/query.c:360
 #, c-format
 msgid "Package `%s' is not installed.\n"
 msgstr "`%s' 꾸러미는 설치하지 않았습니다.\n"
 
-#: src/query.c:365
+#: src/query.c:369
 #, c-format
 msgid "Package `%s' does not contain any files (!)\n"
 msgstr "`%s' 꾸러미에는 어떠한 파일도 들어 있지 않습니다. (!)\n"
 
-#: src/query.c:371
+#: src/query.c:375
 #, c-format
 msgid "locally diverted"
 msgstr "로컬에서 전환"
 
-#: src/query.c:372
+#: src/query.c:376
 #, c-format
 msgid "package diverts others"
 msgstr "이 꾸러미가 다른 꾸러미를 전환"
 
-#: src/query.c:373
+#: src/query.c:377
 #, c-format
 msgid "diverted by %s"
 msgstr "%s 꾸러미가 이 꾸러미를 전환"
 
-#: src/query.c:374
+#: src/query.c:378
 #, c-format
 msgid " to: %s\n"
 msgstr " 다음으로: %s\n"
 
-#: src/query.c:393
+#: src/query.c:397
 msgid ""
 "Use dpkg --info (= dpkg-deb --info) to examine archive files,\n"
 "and dpkg --contents (= dpkg-deb --contents) to list their contents.\n"
@@ -2863,20 +2864,20 @@ msgstr ""
 "아카이브 내용을 보려면 dpkg --contents를 실행하십시오 (= dpkg-deb --"
 "contents)\n"
 
-#: src/query.c:454 dpkg-deb/main.c:46
+#: src/query.c:458 dpkg-deb/main.c:46
 msgid "Debian `"
 msgstr "데비안 `"
 
-#: src/query.c:456
+#: src/query.c:460
 msgid "' package management program query tool\n"
 msgstr "' 꾸러미 관리 프로그램 질의 도구\n"
 
-#: src/query.c:468
+#: src/query.c:472
 #, c-format
 msgid "Usage: "
 msgstr "사용법: "
 
-#: src/query.c:469
+#: src/query.c:473
 #, fuzzy, c-format
 msgid ""
 " [<option>] <command>\n"
@@ -2929,7 +2930,7 @@ msgstr ""
 "  필드의 값을 나타내는 변수를 집어 넣으면 됩니다.  각 필드는 기본적으로\n"
 "  오른쪽 정렬이 되어 표시하고, 너비값이 음수이면 왼쪽 정렬이 됩니다.\n"
 
-#: src/query.c:496
+#: src/query.c:500
 msgid ""
 "Use --help for help about querying packages;\n"
 "Use --licence for copyright licence and lack of warranty (GNU GPL).\n"
@@ -5336,6 +5337,7 @@ msgstr ""
 "저작권 관련 정보를 보려면 dpkg --licence를 참고하십시오.\n"
 
 #: dpkg-deb/main.c:58
+#, fuzzy
 msgid ""
 "Command:\n"
 "  -b|--build <directory> [<deb>]    build an archive.\n"
@@ -5375,8 +5377,8 @@ msgid ""
 "   case left alignment will be used. \n"
 "\n"
 "Use `dpkg' to install and remove packages from your system, or\n"
-"`dselect' for user-friendly package management.  Packages unpacked\n"
-"using `dpkg-deb --extract' will be incorrectly installed !\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"


+ 33 - 31
po/nb.po

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dpkg\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2005-03-18 16:22+0000\n"
+"POT-Creation-Date: 2005-03-21 03:11+0000\n"
 "PO-Revision-Date: 2005-01-25 11:14+0100\n"
 "Last-Translator: Hans Fredrik Nordhaug <hans@nordhaug.priv.no>\n"
 "Language-Team: Norwegian Bokmål <i18n-nb@lister.ping.ui.no>\n"
@@ -2112,7 +2112,7 @@ msgstr "Debian GNU/Linux «"
 msgid "' package management program version "
 msgstr "» pakkehåndteringsprogram, versjon "
 
-#: src/main.c:48 src/query.c:458
+#: src/main.c:48 src/query.c:462
 msgid ""
 "This is free software; see the GNU General Public Licence version 2 or\n"
 "later for copying conditions.  There is NO warranty.\n"
@@ -2122,7 +2122,7 @@ msgstr ""
 "nyere for kopieringsvilkår. Det finnes INGEN garanti.\n"
 "Se"
 
-#: src/main.c:50 src/query.c:460
+#: src/main.c:50 src/query.c:464
 msgid " --licence for copyright and license details.\n"
 msgstr " --licence for informasjon om opphavsrett og lisens.\n"
 
@@ -2190,7 +2190,7 @@ msgid ""
 " 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"
+"Use `dselect' or `aptitude' for user-friendly package management.\n"
 msgstr ""
 "Bruk: \n"
 "  dpkg -i|--install      <.deb-filnavn> ... | -R|--recursive <katalog> ...\n"
@@ -2272,9 +2272,10 @@ msgstr ""
 "Bruk «dselect» for en litt mer brukervennlig pakkehåndtering.\n"
 
 #: src/main.c:119
+#, fuzzy
 msgid ""
 "Type dpkg --help for help about installing and deinstalling packages [*];\n"
-"Use dselect for user-friendly package management;\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"
@@ -2296,7 +2297,7 @@ msgstr ""
 "Valg markert med [*] gir mye tekst - bruk «less» eller «more» for å lese "
 "informasjonen!"
 
-#: src/main.c:184 src/query.c:526 dpkg-deb/main.c:162 dpkg-split/main.c:145
+#: src/main.c:184 src/query.c:530 dpkg-deb/main.c:162 dpkg-split/main.c:145
 #, c-format
 msgid "conflicting actions --%s and --%s"
 msgstr "handlinger i konflikt --%s og --%s"
@@ -2486,7 +2487,7 @@ msgstr "klarte ikke åpne «%i» for strøm"
 msgid "unexpected eof before end of line %d"
 msgstr "uventet slutt på fil før slutten av linje %d"
 
-#: src/main.c:557 src/main.c:572 src/query.c:561 dpkg-deb/main.c:184
+#: src/main.c:557 src/main.c:572 src/query.c:565 dpkg-deb/main.c:184
 #: dpkg-split/main.c:157
 msgid "need an action option"
 msgstr "trenger et handlingsvalg"
@@ -2496,7 +2497,7 @@ msgstr "trenger et handlingsvalg"
 msgid "--%s --pending does not take any non-option arguments"
 msgstr "--%s --pending tar ingen argumenter som ikke er opsjoner"
 
-#: src/packages.c:109 src/query.c:317
+#: src/packages.c:109 src/query.c:321
 #, c-format
 msgid "--%s needs at least one package name argument"
 msgstr "--%s trenger minst ett pakkenavn som parameter"
@@ -2793,80 +2794,80 @@ msgstr "Versjon"
 msgid "Description"
 msgstr "Beskrivelse"
 
-#: src/query.c:220 src/query.c:442 src/select.c:80
+#: src/query.c:218 src/query.c:446 src/select.c:80
 #, c-format
 msgid "No packages found matching %s.\n"
 msgstr "Fant ingen pakker som passer til «%s».\n"
 
-#: src/query.c:236
+#: src/query.c:240
 #, c-format
 msgid "diversion by %s"
 msgstr "omdirigert med %s"
 
-#: src/query.c:237
+#: src/query.c:241
 #, c-format
 msgid "local diversion"
 msgstr "lokal omdirigering"
 
-#: src/query.c:238
+#: src/query.c:242
 msgid "to"
 msgstr "til"
 
-#: src/query.c:238
+#: src/query.c:242
 msgid "from"
 msgstr "fra"
 
-#: src/query.c:271
+#: src/query.c:275
 msgid "--search needs at least one file name pattern argument"
 msgstr "--search krever minst ett filnavnsmønster som parameter"
 
-#: src/query.c:299
+#: src/query.c:303
 #, c-format
 msgid "dpkg: %s not found.\n"
 msgstr "dpkg: fant ikke %s.\n"
 
-#: src/query.c:337
+#: src/query.c:341
 #, c-format
 msgid "Package `%s' is not installed and no info is available.\n"
 msgstr ""
 "Pakken «%s» er ikke installert og det finnes ingen informasjon om den.\n"
 
-#: src/query.c:346
+#: src/query.c:350
 #, c-format
 msgid "Package `%s' is not available.\n"
 msgstr "Pakken «%s» er ikke tilgjengelig.\n"
 
-#: src/query.c:356
+#: src/query.c:360
 #, c-format
 msgid "Package `%s' is not installed.\n"
 msgstr "Pakken «%s» er ikke installert.\n"
 
-#: src/query.c:365
+#: src/query.c:369
 #, c-format
 msgid "Package `%s' does not contain any files (!)\n"
 msgstr "Pakken «%s» inneholder ingen filer (!)\n"
 
-#: src/query.c:371
+#: src/query.c:375
 #, c-format
 msgid "locally diverted"
 msgstr "lokalt omdirigert"
 
-#: src/query.c:372
+#: src/query.c:376
 #, c-format
 msgid "package diverts others"
 msgstr "pakken omdirigerer andre"
 
-#: src/query.c:373
+#: src/query.c:377
 #, c-format
 msgid "diverted by %s"
 msgstr "omdirigert av %s"
 
-#: src/query.c:374
+#: src/query.c:378
 #, c-format
 msgid " to: %s\n"
 msgstr " til: %s\n"
 
-#: src/query.c:393
+#: src/query.c:397
 msgid ""
 "Use dpkg --info (= dpkg-deb --info) to examine archive files,\n"
 "and dpkg --contents (= dpkg-deb --contents) to list their contents.\n"
@@ -2874,20 +2875,20 @@ 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:454 dpkg-deb/main.c:46
+#: src/query.c:458 dpkg-deb/main.c:46
 msgid "Debian `"
 msgstr "Debian «"
 
-#: src/query.c:456
+#: src/query.c:460
 msgid "' package management program query tool\n"
 msgstr "» pakkehåndteringsprogram og spørreverktøy\n"
 
-#: src/query.c:468
+#: src/query.c:472
 #, c-format
 msgid "Usage: "
 msgstr "Bruk: "
 
-#: src/query.c:469
+#: src/query.c:473
 #, fuzzy, c-format
 msgid ""
 " [<option>] <command>\n"
@@ -2941,7 +2942,7 @@ msgstr ""
 "  ${var[;breidd]}. Felta vil være høgrejusterte, med mindre breidda er \n"
 "negativ. I så fall vil dei være venstrejusterte.\n"
 
-#: src/query.c:496
+#: src/query.c:500
 msgid ""
 "Use --help for help about querying packages;\n"
 "Use --licence for copyright licence and lack of warranty (GNU GPL).\n"
@@ -5349,6 +5350,7 @@ msgstr ""
 "Se «dpkg-deb --licence» for detaljer.\n"
 
 #: dpkg-deb/main.c:58
+#, fuzzy
 msgid ""
 "Command:\n"
 "  -b|--build <directory> [<deb>]    build an archive.\n"
@@ -5388,8 +5390,8 @@ msgid ""
 "   case left alignment will be used. \n"
 "\n"
 "Use `dpkg' to install and remove packages from your system, or\n"
-"`dselect' for user-friendly package management.  Packages unpacked\n"
-"using `dpkg-deb --extract' will be incorrectly installed !\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"


+ 33 - 31
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: 2005-03-18 16:22+0000\n"
+"POT-Creation-Date: 2005-03-21 03:11+0000\n"
 "PO-Revision-Date: 2005-01-06 23:41+0100\n"
 "Last-Translator: Bart Cornelis <cobaco@linux.be>\n"
 "Language-Team: Dutch <debian-l10n-dutch@debian.org>\n"
@@ -2138,7 +2138,7 @@ msgstr "Debian GNU/Linux `"
 msgid "' package management program version "
 msgstr "' beheerprogramma voor pakketten versie "
 
-#: src/main.c:48 src/query.c:458
+#: src/main.c:48 src/query.c:462
 msgid ""
 "This is free software; see the GNU General Public Licence version 2 or\n"
 "later for copying conditions.  There is NO warranty.\n"
@@ -2148,7 +2148,7 @@ msgstr ""
 "of later voor kopieervoorwaarden.  Er is GEEN garantie.\n"
 "Zie "
 
-#: src/main.c:50 src/query.c:460
+#: src/main.c:50 src/query.c:464
 msgid " --licence for copyright and license details.\n"
 msgstr " --licence voor copyright en licentie details.\n"
 
@@ -2216,7 +2216,7 @@ msgid ""
 " 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"
+"Use `dselect' or `aptitude' for user-friendly package management.\n"
 msgstr ""
 "Gebruik: \n"
 "  dpkg -i|--install      <.deb bestandsnaam> ... | -R|--recursive <map> ...\n"
@@ -2291,9 +2291,10 @@ msgstr ""
 "Gebruik `dselect' voor gebruikersvriendelijk pakketbeheer.\n"
 
 #: src/main.c:119
+#, fuzzy
 msgid ""
 "Type dpkg --help for help about installing and deinstalling packages [*];\n"
-"Use dselect for user-friendly package management;\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"
@@ -2315,7 +2316,7 @@ msgstr ""
 "Opties gemarkeerd met [*] produreren een hoop uitvoer - pijp het door `less' "
 "of `more' !"
 
-#: src/main.c:184 src/query.c:526 dpkg-deb/main.c:162 dpkg-split/main.c:145
+#: src/main.c:184 src/query.c:530 dpkg-deb/main.c:162 dpkg-split/main.c:145
 #, c-format
 msgid "conflicting actions --%s and --%s"
 msgstr "tegenstrijdige acties --%s en --%s"
@@ -2515,7 +2516,7 @@ msgstr "kon `%i' niet openen voor stream"
 msgid "unexpected eof before end of line %d"
 msgstr "onverwacht bestandseinde voor einde regel %d"
 
-#: src/main.c:557 src/main.c:572 src/query.c:561 dpkg-deb/main.c:184
+#: src/main.c:557 src/main.c:572 src/query.c:565 dpkg-deb/main.c:184
 #: dpkg-split/main.c:157
 msgid "need an action option"
 msgstr "heb een actie-optie nodig"
@@ -2525,7 +2526,7 @@ msgstr "heb een actie-optie nodig"
 msgid "--%s --pending does not take any non-option arguments"
 msgstr "--%s --pending accepteert geen niet-optie argumenten"
 
-#: src/packages.c:109 src/query.c:317
+#: src/packages.c:109 src/query.c:321
 #, c-format
 msgid "--%s needs at least one package name argument"
 msgstr "--%s heeft ten minste een pakketnaam argument nodig"
@@ -2823,79 +2824,79 @@ msgstr "Versie"
 msgid "Description"
 msgstr "Omschrijving"
 
-#: src/query.c:220 src/query.c:442 src/select.c:80
+#: src/query.c:218 src/query.c:446 src/select.c:80
 #, c-format
 msgid "No packages found matching %s.\n"
 msgstr "Geen pakketten gevonden overeenkomend met %s.\n"
 
-#: src/query.c:236
+#: src/query.c:240
 #, c-format
 msgid "diversion by %s"
 msgstr "verwijzing door %s"
 
-#: src/query.c:237
+#: src/query.c:241
 #, c-format
 msgid "local diversion"
 msgstr "lokale verwijzing"
 
-#: src/query.c:238
+#: src/query.c:242
 msgid "to"
 msgstr "naar"
 
-#: src/query.c:238
+#: src/query.c:242
 msgid "from"
 msgstr "van"
 
-#: src/query.c:271
+#: src/query.c:275
 msgid "--search needs at least one file name pattern argument"
 msgstr "--search heeft ten minste een bestandsnaam patroon argument nodig"
 
-#: src/query.c:299
+#: src/query.c:303
 #, c-format
 msgid "dpkg: %s not found.\n"
 msgstr "dpkg: %s niet gevonden.\n"
 
-#: src/query.c:337
+#: src/query.c:341
 #, c-format
 msgid "Package `%s' is not installed and no info is available.\n"
 msgstr "Pakket `%s' is niet geïnstalleerd en geen info is beschikbaar.\n"
 
-#: src/query.c:346
+#: src/query.c:350
 #, c-format
 msgid "Package `%s' is not available.\n"
 msgstr "Pakket `%s' is niet beschikbaar.\n"
 
-#: src/query.c:356
+#: src/query.c:360
 #, c-format
 msgid "Package `%s' is not installed.\n"
 msgstr "Pakket `%s' is niet geïnstalleerd.\n"
 
-#: src/query.c:365
+#: src/query.c:369
 #, c-format
 msgid "Package `%s' does not contain any files (!)\n"
 msgstr "Pakket `%s' bevat geen bestanden (!)\n"
 
-#: src/query.c:371
+#: src/query.c:375
 #, c-format
 msgid "locally diverted"
 msgstr "lokaal omgeleid"
 
-#: src/query.c:372
+#: src/query.c:376
 #, c-format
 msgid "package diverts others"
 msgstr "pakket leidt andere om"
 
-#: src/query.c:373
+#: src/query.c:377
 #, c-format
 msgid "diverted by %s"
 msgstr "omgeleid door %s"
 
-#: src/query.c:374
+#: src/query.c:378
 #, c-format
 msgid " to: %s\n"
 msgstr " naar: %s\n"
 
-#: src/query.c:393
+#: src/query.c:397
 msgid ""
 "Use dpkg --info (= dpkg-deb --info) to examine archive files,\n"
 "and dpkg --contents (= dpkg-deb --contents) to list their contents.\n"
@@ -2903,20 +2904,20 @@ 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:454 dpkg-deb/main.c:46
+#: src/query.c:458 dpkg-deb/main.c:46
 msgid "Debian `"
 msgstr "Debian GNU/Linux `"
 
-#: src/query.c:456
+#: src/query.c:460
 msgid "' package management program query tool\n"
 msgstr "' beheerprogramma voor pakketten versie\n"
 
-#: src/query.c:468
+#: src/query.c:472
 #, c-format
 msgid "Usage: "
 msgstr "Gebruik: "
 
-#: src/query.c:469
+#: src/query.c:473
 #, fuzzy, c-format
 msgid ""
 " [<option>] <command>\n"
@@ -2970,7 +2971,7 @@ msgstr ""
 "  Velden worden rechts uitgelijnd tenzij de breedte negatief is, in dat\n"
 "  geval worden ze links uitgelijnd.\n"
 
-#: src/query.c:496
+#: src/query.c:500
 msgid ""
 "Use --help for help about querying packages;\n"
 "Use --licence for copyright licence and lack of warranty (GNU GPL).\n"
@@ -5390,6 +5391,7 @@ msgstr ""
 "Zie dpkg --licence voor auteursrechten en licentiedetails.\n"
 
 #: dpkg-deb/main.c:58
+#, fuzzy
 msgid ""
 "Command:\n"
 "  -b|--build <directory> [<deb>]    build an archive.\n"
@@ -5429,8 +5431,8 @@ msgid ""
 "   case left alignment will be used. \n"
 "\n"
 "Use `dpkg' to install and remove packages from your system, or\n"
-"`dselect' for user-friendly package management.  Packages unpacked\n"
-"using `dpkg-deb --extract' will be incorrectly installed !\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"


+ 33 - 31
po/nn.po

@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dpkg_nn\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2005-03-18 16:22+0000\n"
+"POT-Creation-Date: 2005-03-21 03:11+0000\n"
 "PO-Revision-Date: 2005-01-08 16:16+0100\n"
 "Last-Translator: Håvard Korsvoll <korsvoll@skulelinux.no>\n"
 "Language-Team: Norwegian (Nynorsk) <i18n-nn@lister.ping.uio.no>\n"
@@ -2121,7 +2121,7 @@ msgstr "Debian GNU/Linux «"
 msgid "' package management program version "
 msgstr "» pakkehandteringsprogram, versjon "
 
-#: src/main.c:48 src/query.c:458
+#: src/main.c:48 src/query.c:462
 msgid ""
 "This is free software; see the GNU General Public Licence version 2 or\n"
 "later for copying conditions.  There is NO warranty.\n"
@@ -2131,7 +2131,7 @@ msgstr ""
 "nyare for kopieringsvilkår. Det finst INGEN garanti.\n"
 "Sjå "
 
-#: src/main.c:50 src/query.c:460
+#: src/main.c:50 src/query.c:464
 msgid " --licence for copyright and license details.\n"
 msgstr " --licence for informasjon om opphavsrett og lisens.\n"
 
@@ -2199,7 +2199,7 @@ msgid ""
 " 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"
+"Use `dselect' or `aptitude' for user-friendly package management.\n"
 msgstr ""
 "Bruk: \n"
 "  dpkg -i|--install      <.deb-filnamn> ... | -R|--recursive <katalog> ...\n"
@@ -2282,9 +2282,10 @@ msgstr ""
 "Bruk «dselect» for ei litt meir brukarvennleg pakkehandtering.\n"
 
 #: src/main.c:119
+#, fuzzy
 msgid ""
 "Type dpkg --help for help about installing and deinstalling packages [*];\n"
-"Use dselect for user-friendly package management;\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"
@@ -2306,7 +2307,7 @@ msgstr ""
 "Val markert med [*] gjev mykje tekst - bruk «less» eller «more» for å lesa "
 "informasjonen."
 
-#: src/main.c:184 src/query.c:526 dpkg-deb/main.c:162 dpkg-split/main.c:145
+#: src/main.c:184 src/query.c:530 dpkg-deb/main.c:162 dpkg-split/main.c:145
 #, c-format
 msgid "conflicting actions --%s and --%s"
 msgstr "handlingar i konflikt --%s og --%s"
@@ -2499,7 +2500,7 @@ msgstr "klarte ikkje opna «%i» for straum"
 msgid "unexpected eof before end of line %d"
 msgstr "uventa slutt på fil før slutten av linje %d"
 
-#: src/main.c:557 src/main.c:572 src/query.c:561 dpkg-deb/main.c:184
+#: src/main.c:557 src/main.c:572 src/query.c:565 dpkg-deb/main.c:184
 #: dpkg-split/main.c:157
 msgid "need an action option"
 msgstr "treng eit handlingsval"
@@ -2509,7 +2510,7 @@ msgstr "treng eit handlingsval"
 msgid "--%s --pending does not take any non-option arguments"
 msgstr "--%s --pending tek ingen ikkje-valparametrar"
 
-#: src/packages.c:109 src/query.c:317
+#: src/packages.c:109 src/query.c:321
 #, c-format
 msgid "--%s needs at least one package name argument"
 msgstr "--%s treng minst eitt pakkenamn som parameter"
@@ -2806,80 +2807,80 @@ msgstr "Versjon"
 msgid "Description"
 msgstr "Skildring"
 
-#: src/query.c:220 src/query.c:442 src/select.c:80
+#: src/query.c:218 src/query.c:446 src/select.c:80
 #, c-format
 msgid "No packages found matching %s.\n"
 msgstr "Fann ingen pakkar som passar til «%s».\n"
 
-#: src/query.c:236
+#: src/query.c:240
 #, c-format
 msgid "diversion by %s"
 msgstr "omdirigert med %s"
 
-#: src/query.c:237
+#: src/query.c:241
 #, c-format
 msgid "local diversion"
 msgstr "lokal omdirigering"
 
-#: src/query.c:238
+#: src/query.c:242
 msgid "to"
 msgstr "til"
 
-#: src/query.c:238
+#: src/query.c:242
 msgid "from"
 msgstr "frå"
 
-#: src/query.c:271
+#: src/query.c:275
 msgid "--search needs at least one file name pattern argument"
 msgstr "--search krev minst eitt filnamnsmønster som parameter"
 
-#: src/query.c:299
+#: src/query.c:303
 #, c-format
 msgid "dpkg: %s not found.\n"
 msgstr "dpkg: fann ikkje %s.\n"
 
-#: src/query.c:337
+#: src/query.c:341
 #, c-format
 msgid "Package `%s' is not installed and no info is available.\n"
 msgstr ""
 "Pakken «%s» er ikkje installert og det finst ingen informasjon om han.\n"
 
-#: src/query.c:346
+#: src/query.c:350
 #, c-format
 msgid "Package `%s' is not available.\n"
 msgstr "Pakken «%s» er ikkje tilgjengeleg.\n"
 
-#: src/query.c:356
+#: src/query.c:360
 #, c-format
 msgid "Package `%s' is not installed.\n"
 msgstr "Pakken «%s» er ikkje installert.\n"
 
-#: src/query.c:365
+#: src/query.c:369
 #, c-format
 msgid "Package `%s' does not contain any files (!)\n"
 msgstr "Pakken «%s» inneheld ingen filer (!)\n"
 
-#: src/query.c:371
+#: src/query.c:375
 #, c-format
 msgid "locally diverted"
 msgstr "lokalt omdirigert"
 
-#: src/query.c:372
+#: src/query.c:376
 #, c-format
 msgid "package diverts others"
 msgstr "pakken omdirigerer andre"
 
-#: src/query.c:373
+#: src/query.c:377
 #, c-format
 msgid "diverted by %s"
 msgstr "omdirigert av %s"
 
-#: src/query.c:374
+#: src/query.c:378
 #, c-format
 msgid " to: %s\n"
 msgstr " til: %s\n"
 
-#: src/query.c:393
+#: src/query.c:397
 msgid ""
 "Use dpkg --info (= dpkg-deb --info) to examine archive files,\n"
 "and dpkg --contents (= dpkg-deb --contents) to list their contents.\n"
@@ -2887,20 +2888,20 @@ 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:454 dpkg-deb/main.c:46
+#: src/query.c:458 dpkg-deb/main.c:46
 msgid "Debian `"
 msgstr "Debian «"
 
-#: src/query.c:456
+#: src/query.c:460
 msgid "' package management program query tool\n"
 msgstr "» pakkehandteringsprogram\n"
 
-#: src/query.c:468
+#: src/query.c:472
 #, c-format
 msgid "Usage: "
 msgstr "Bruk: "
 
-#: src/query.c:469
+#: src/query.c:473
 #, fuzzy, c-format
 msgid ""
 " [<option>] <command>\n"
@@ -2954,7 +2955,7 @@ 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:496
+#: src/query.c:500
 msgid ""
 "Use --help for help about querying packages;\n"
 "Use --licence for copyright licence and lack of warranty (GNU GPL).\n"
@@ -5354,6 +5355,7 @@ msgstr ""
 "Sjå «dpkg-deb --licence» for detaljar.\n"
 
 #: dpkg-deb/main.c:58
+#, fuzzy
 msgid ""
 "Command:\n"
 "  -b|--build <directory> [<deb>]    build an archive.\n"
@@ -5393,8 +5395,8 @@ msgid ""
 "   case left alignment will be used. \n"
 "\n"
 "Use `dpkg' to install and remove packages from your system, or\n"
-"`dselect' for user-friendly package management.  Packages unpacked\n"
-"using `dpkg-deb --extract' will be incorrectly installed !\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"


+ 33 - 31
po/pl.po

@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dpkg 1.9.20\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2005-03-18 16:22+0000\n"
+"POT-Creation-Date: 2005-03-21 03:11+0000\n"
 "PO-Revision-Date: 2005-01-05 19:50+0100\n"
 "Last-Translator: Bartosz Fenski <fenio@debian.org>\n"
 "Language-Team: Polish <pddp@debian.linux.org.pl>\n"
@@ -2133,7 +2133,7 @@ msgstr "Debian GNU/Linux `"
 msgid "' package management program version "
 msgstr "' program do zarz±dzania pakietami, wersja "
 
-#: src/main.c:48 src/query.c:458
+#: src/main.c:48 src/query.c:462
 msgid ""
 "This is free software; see the GNU General Public Licence version 2 or\n"
 "later for copying conditions.  There is NO warranty.\n"
@@ -2144,7 +2144,7 @@ msgstr ""
 "by dowiedzieæ siê o warunkach dystrybucji. Brak JAKIEJKOLWIEK gwarancji.\n"
 "Sprawd¼ "
 
-#: src/main.c:50 src/query.c:460
+#: src/main.c:50 src/query.c:464
 msgid " --licence for copyright and license details.\n"
 msgstr " --licence informacje o prawach autorskich i licencji.\n"
 
@@ -2212,7 +2212,7 @@ msgid ""
 " 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"
+"Use `dselect' or `aptitude' for user-friendly package management.\n"
 msgstr ""
 "U¿ycie: \n"
 "  dpkg -i|--install      <plik .deb> ... | -R|--recursive <katalog> ...\n"
@@ -2289,9 +2289,10 @@ msgstr ""
 "pakietami.\n"
 
 #: src/main.c:119
+#, fuzzy
 msgid ""
 "Type dpkg --help for help about installing and deinstalling packages [*];\n"
-"Use dselect for user-friendly package management;\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"
@@ -2312,7 +2313,7 @@ msgstr ""
 "\n"
 "Opcje oznaczone [*] podaj± du¿o tre¶ci - skieruj potok na `less' lub `more' !"
 
-#: src/main.c:184 src/query.c:526 dpkg-deb/main.c:162 dpkg-split/main.c:145
+#: src/main.c:184 src/query.c:530 dpkg-deb/main.c:162 dpkg-split/main.c:145
 #, c-format
 msgid "conflicting actions --%s and --%s"
 msgstr "konflikt miêdzy dzia³aniem --%s i --%s"
@@ -2503,7 +2504,7 @@ msgstr "nie uda
 msgid "unexpected eof before end of line %d"
 msgstr "niespodziewany EOF przed koñcem linii %d"
 
-#: src/main.c:557 src/main.c:572 src/query.c:561 dpkg-deb/main.c:184
+#: src/main.c:557 src/main.c:572 src/query.c:565 dpkg-deb/main.c:184
 #: dpkg-split/main.c:157
 msgid "need an action option"
 msgstr "nale¿y okre¶liæ dzia³anie"
@@ -2513,7 +2514,7 @@ msgstr "nale
 msgid "--%s --pending does not take any non-option arguments"
 msgstr "--%s --pending wymaga niepodawania argumentów nie bêd±cych opcj±"
 
-#: src/packages.c:109 src/query.c:317
+#: src/packages.c:109 src/query.c:321
 #, c-format
 msgid "--%s needs at least one package name argument"
 msgstr "--%s wymaga co najmniej jednej nazwy pakietu"
@@ -2818,80 +2819,80 @@ msgstr "Wersja"
 msgid "Description"
 msgstr "Opis"
 
-#: src/query.c:220 src/query.c:442 src/select.c:80
+#: src/query.c:218 src/query.c:446 src/select.c:80
 #, c-format
 msgid "No packages found matching %s.\n"
 msgstr "Nie znaleziono pakietu pasuj±cego do wzorca %s.\n"
 
-#: src/query.c:236
+#: src/query.c:240
 #, c-format
 msgid "diversion by %s"
 msgstr "ominiêcie przez %s"
 
-#: src/query.c:237
+#: src/query.c:241
 #, c-format
 msgid "local diversion"
 msgstr "lokalne ominiêcie"
 
-#: src/query.c:238
+#: src/query.c:242
 msgid "to"
 msgstr "od"
 
-#: src/query.c:238
+#: src/query.c:242
 msgid "from"
 msgstr "do"
 
-#: src/query.c:271
+#: src/query.c:275
 msgid "--search needs at least one file name pattern argument"
 msgstr "--search wymaga podania co najmniej jednego wzorca pliku"
 
-#: src/query.c:299
+#: src/query.c:303
 #, c-format
 msgid "dpkg: %s not found.\n"
 msgstr "dpkg: %s nie odnaleziony.\n"
 
-#: src/query.c:337
+#: src/query.c:341
 #, c-format
 msgid "Package `%s' is not installed and no info is available.\n"
 msgstr ""
 "Pakiet `%s' nie jest zainstalowany i informacje o nim nie s± dostêpne.\n"
 
-#: src/query.c:346
+#: src/query.c:350
 #, c-format
 msgid "Package `%s' is not available.\n"
 msgstr "Pakiet `%s' nie jest dostêpny.\n"
 
-#: src/query.c:356
+#: src/query.c:360
 #, c-format
 msgid "Package `%s' is not installed.\n"
 msgstr "Pakiet `%s' nie jest zainstalowany.\n"
 
-#: src/query.c:365
+#: src/query.c:369
 #, c-format
 msgid "Package `%s' does not contain any files (!)\n"
 msgstr "Pakiet `%s' nie zawiera ¿adnego pliku (!)\n"
 
-#: src/query.c:371
+#: src/query.c:375
 #, c-format
 msgid "locally diverted"
 msgstr "lokalnie ominiêty"
 
-#: src/query.c:372
+#: src/query.c:376
 #, c-format
 msgid "package diverts others"
 msgstr "pakiet omija inne"
 
-#: src/query.c:373
+#: src/query.c:377
 #, c-format
 msgid "diverted by %s"
 msgstr "ominiêty przez %s"
 
-#: src/query.c:374
+#: src/query.c:378
 #, c-format
 msgid " to: %s\n"
 msgstr " do: %s\n"
 
-#: src/query.c:393
+#: src/query.c:397
 msgid ""
 "Use dpkg --info (= dpkg-deb --info) to examine archive files,\n"
 "and dpkg --contents (= dpkg-deb --contents) to list their contents.\n"
@@ -2899,20 +2900,20 @@ 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:454 dpkg-deb/main.c:46
+#: src/query.c:458 dpkg-deb/main.c:46
 msgid "Debian `"
 msgstr "Debian `"
 
-#: src/query.c:456
+#: src/query.c:460
 msgid "' package management program query tool\n"
 msgstr "' narzêdzie do przeszukiwania pakietów\n"
 
-#: src/query.c:468
+#: src/query.c:472
 #, c-format
 msgid "Usage: "
 msgstr "U¿ywanie: "
 
-#: src/query.c:469
+#: src/query.c:473
 #, fuzzy, c-format
 msgid ""
 " [<option>] <command>\n"
@@ -2964,7 +2965,7 @@ msgstr ""
 "  strony, chyba ¿e zmienna szeroko¶æ jest ujemna, co spowoduje \n"
 "  przesuniêcie do strony lewej.\n"
 
-#: src/query.c:496
+#: src/query.c:500
 msgid ""
 "Use --help for help about querying packages;\n"
 "Use --licence for copyright licence and lack of warranty (GNU GPL).\n"
@@ -5389,6 +5390,7 @@ msgstr ""
 "Wiêcej szczegó³ów w dpkg-deb --license.\n"
 
 #: dpkg-deb/main.c:58
+#, fuzzy
 msgid ""
 "Command:\n"
 "  -b|--build <directory> [<deb>]    build an archive.\n"
@@ -5428,8 +5430,8 @@ msgid ""
 "   case left alignment will be used. \n"
 "\n"
 "Use `dpkg' to install and remove packages from your system, or\n"
-"`dselect' for user-friendly package management.  Packages unpacked\n"
-"using `dpkg-deb --extract' will be incorrectly installed !\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"


+ 33 - 31
po/pt.po

@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dpkg 1.14\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2005-03-18 16:22+0000\n"
+"POT-Creation-Date: 2005-03-21 03:11+0000\n"
 "PO-Revision-Date: 2005-01-09 09:20+0000\n"
 "Last-Translator: Miguel Figueiredo <elmig@debianpt.org>\n"
 "Language-Team: Portuguese <traduz@debianpt.org>\n"
@@ -2142,7 +2142,7 @@ msgstr "Debian GNU/Linux `"
 msgid "' package management program version "
 msgstr "' versão de programa de gestão de pacotes "
 
-#: src/main.c:48 src/query.c:458
+#: src/main.c:48 src/query.c:462
 msgid ""
 "This is free software; see the GNU General Public Licence version 2 or\n"
 "later for copying conditions.  There is NO warranty.\n"
@@ -2153,7 +2153,7 @@ msgstr ""
 "superior para condições de cópia.  NÃO existe garantia.\n"
 "Veja "
 
-#: src/main.c:50 src/query.c:460
+#: src/main.c:50 src/query.c:464
 msgid " --licence for copyright and license details.\n"
 msgstr " --licence para detalhes de copyright e licença.\n"
 
@@ -2221,7 +2221,7 @@ msgid ""
 " 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"
+"Use `dselect' or `aptitude' for user-friendly package management.\n"
 msgstr ""
 "Utilização: \n"
 "  dpkg -i|--install      <.deb nome ficheiro> ... | -R|--recursive "
@@ -2310,9 +2310,10 @@ msgstr ""
 "Utilize o `dselect' ou o aptitude para uma gestão de pacotes user-friendly.\n"
 
 #: src/main.c:119
+#, fuzzy
 msgid ""
 "Type dpkg --help for help about installing and deinstalling packages [*];\n"
-"Use dselect for user-friendly package management;\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"
@@ -2334,7 +2335,7 @@ msgstr ""
 "Opções marcadas com [*] produzem muita saída de texto - utilize pipes com "
 "`less' ou `more' !"
 
-#: src/main.c:184 src/query.c:526 dpkg-deb/main.c:162 dpkg-split/main.c:145
+#: src/main.c:184 src/query.c:530 dpkg-deb/main.c:162 dpkg-split/main.c:145
 #, c-format
 msgid "conflicting actions --%s and --%s"
 msgstr "acções em conflito --%s e --%s"
@@ -2538,7 +2539,7 @@ msgstr "não pode abrir `%i' para stream"
 msgid "unexpected eof before end of line %d"
 msgstr "eof inesperado antes do fim da linha %d"
 
-#: src/main.c:557 src/main.c:572 src/query.c:561 dpkg-deb/main.c:184
+#: src/main.c:557 src/main.c:572 src/query.c:565 dpkg-deb/main.c:184
 #: dpkg-split/main.c:157
 msgid "need an action option"
 msgstr "é necessária uma opção de acção"
@@ -2548,7 +2549,7 @@ msgstr "é necessária uma opção de acção"
 msgid "--%s --pending does not take any non-option arguments"
 msgstr "--%s --pending não leva quaisquer argumentos não-opção"
 
-#: src/packages.c:109 src/query.c:317
+#: src/packages.c:109 src/query.c:321
 #, c-format
 msgid "--%s needs at least one package name argument"
 msgstr "--%s necessita de pelo menos um argumento de nome de pacote"
@@ -2854,80 +2855,80 @@ msgstr "Versão"
 msgid "Description"
 msgstr "Descrição"
 
-#: src/query.c:220 src/query.c:442 src/select.c:80
+#: src/query.c:218 src/query.c:446 src/select.c:80
 #, c-format
 msgid "No packages found matching %s.\n"
 msgstr "Não foram encontrados pacotes coincidindo com %s.\n"
 
-#: src/query.c:236
+#: src/query.c:240
 #, c-format
 msgid "diversion by %s"
 msgstr "desvio por %s"
 
-#: src/query.c:237
+#: src/query.c:241
 #, c-format
 msgid "local diversion"
 msgstr "desvio local"
 
-#: src/query.c:238
+#: src/query.c:242
 msgid "to"
 msgstr "para"
 
-#: src/query.c:238
+#: src/query.c:242
 msgid "from"
 msgstr "de"
 
-#: src/query.c:271
+#: src/query.c:275
 msgid "--search needs at least one file name pattern argument"
 msgstr ""
 "--search necessita de pelo menos um argumento de pattern de nome de ficheiro"
 
-#: src/query.c:299
+#: src/query.c:303
 #, c-format
 msgid "dpkg: %s not found.\n"
 msgstr "dpkg: %s não foi encontrado.\n"
 
-#: src/query.c:337
+#: src/query.c:341
 #, c-format
 msgid "Package `%s' is not installed and no info is available.\n"
 msgstr "O pacote `%s' não está instalado e não está disponível informação.\n"
 
-#: src/query.c:346
+#: src/query.c:350
 #, c-format
 msgid "Package `%s' is not available.\n"
 msgstr "O pacote `%s' não está disponível.\n"
 
-#: src/query.c:356
+#: src/query.c:360
 #, c-format
 msgid "Package `%s' is not installed.\n"
 msgstr "O pacote `%s' não está instalado.\n"
 
-#: src/query.c:365
+#: src/query.c:369
 #, c-format
 msgid "Package `%s' does not contain any files (!)\n"
 msgstr "O pacote `%s' não contém qualquer ficheiro (!)\n"
 
-#: src/query.c:371
+#: src/query.c:375
 #, c-format
 msgid "locally diverted"
 msgstr "localmente desviado"
 
-#: src/query.c:372
+#: src/query.c:376
 #, c-format
 msgid "package diverts others"
 msgstr "o pacote desvia outros"
 
-#: src/query.c:373
+#: src/query.c:377
 #, c-format
 msgid "diverted by %s"
 msgstr "desviado por %s"
 
-#: src/query.c:374
+#: src/query.c:378
 #, c-format
 msgid " to: %s\n"
 msgstr " para: %s\n"
 
-#: src/query.c:393
+#: src/query.c:397
 msgid ""
 "Use dpkg --info (= dpkg-deb --info) to examine archive files,\n"
 "and dpkg --contents (= dpkg-deb --contents) to list their contents.\n"
@@ -2935,20 +2936,20 @@ 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:454 dpkg-deb/main.c:46
+#: src/query.c:458 dpkg-deb/main.c:46
 msgid "Debian `"
 msgstr "Debian `"
 
-#: src/query.c:456
+#: src/query.c:460
 msgid "' package management program query tool\n"
 msgstr "' ferramenta de query do programa de gestão de pacotes\n"
 
-#: src/query.c:468
+#: src/query.c:472
 #, c-format
 msgid "Usage: "
 msgstr "Utilização: "
 
-#: src/query.c:469
+#: src/query.c:473
 #, fuzzy, c-format
 msgid ""
 " [<option>] <command>\n"
@@ -3006,7 +3007,7 @@ msgstr ""
 "  a largura seja negativa, neste caso o alinhamento à esquerda será "
 "utilizado.\n"
 
-#: src/query.c:496
+#: src/query.c:500
 msgid ""
 "Use --help for help about querying packages;\n"
 "Use --licence for copyright licence and lack of warranty (GNU GPL).\n"
@@ -5443,6 +5444,7 @@ msgstr ""
 "Veja os detalhes em dpkg-deb --licence.\n"
 
 #: dpkg-deb/main.c:58
+#, fuzzy
 msgid ""
 "Command:\n"
 "  -b|--build <directory> [<deb>]    build an archive.\n"
@@ -5482,8 +5484,8 @@ msgid ""
 "   case left alignment will be used. \n"
 "\n"
 "Use `dpkg' to install and remove packages from your system, or\n"
-"`dselect' for user-friendly package management.  Packages unpacked\n"
-"using `dpkg-deb --extract' will be incorrectly installed !\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>]   constrói um arquivo.\n"


+ 33 - 31
po/pt_BR.po

@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dpkg\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2005-03-18 16:22+0000\n"
+"POT-Creation-Date: 2005-03-21 03:11+0000\n"
 "PO-Revision-Date: 2005-01-06 16:42-0200\n"
 "Last-Translator: André Luís Lopes <andrelop@debian.org>\n"
 "Language-Team: Debian-BR Project <debian-l10n-portuguese@lists.debian.org>\n"
@@ -2144,7 +2144,7 @@ msgstr "Debian GNU/Linux `"
 msgid "' package management program version "
 msgstr "' programa de gerenciamento de pacotes versão "
 
-#: src/main.c:48 src/query.c:458
+#: src/main.c:48 src/query.c:462
 msgid ""
 "This is free software; see the GNU General Public Licence version 2 or\n"
 "later for copying conditions.  There is NO warranty.\n"
@@ -2154,7 +2154,7 @@ msgstr ""
 "mais atual para condições de cópia.  Não há NENHUMA garantia.\n"
 "Veja "
 
-#: src/main.c:50 src/query.c:460
+#: src/main.c:50 src/query.c:464
 msgid " --licence for copyright and license details.\n"
 msgstr " --licence para copyright e detalhes de licenciamento.\n"
 
@@ -2222,7 +2222,7 @@ msgid ""
 " 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"
+"Use `dselect' or `aptitude' for user-friendly package management.\n"
 msgstr ""
 "Uso: \n"
 "  dpkg -i|--install      <nome de arquivo .deb> ... | -R|--recursive "
@@ -2310,9 +2310,10 @@ msgstr ""
 "Use `dselect' ou 'aptitude' para gerenciamento amigável de pacotes.\n"
 
 #: src/main.c:119
+#, fuzzy
 msgid ""
 "Type dpkg --help for help about installing and deinstalling packages [*];\n"
-"Use dselect for user-friendly package management;\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"
@@ -2335,7 +2336,7 @@ msgstr ""
 "Opções marcadas com [*] produzem muita saída de texto - passe-a por `less' "
 "ou `more' !"
 
-#: src/main.c:184 src/query.c:526 dpkg-deb/main.c:162 dpkg-split/main.c:145
+#: src/main.c:184 src/query.c:530 dpkg-deb/main.c:162 dpkg-split/main.c:145
 #, c-format
 msgid "conflicting actions --%s and --%s"
 msgstr "ações conflitantes --%s e --%s"
@@ -2536,7 +2537,7 @@ msgstr "n
 msgid "unexpected eof before end of line %d"
 msgstr "eof inesperado após fim da linha %d"
 
-#: src/main.c:557 src/main.c:572 src/query.c:561 dpkg-deb/main.c:184
+#: src/main.c:557 src/main.c:572 src/query.c:565 dpkg-deb/main.c:184
 #: dpkg-split/main.c:157
 msgid "need an action option"
 msgstr "preciso de uma opção de ação"
@@ -2546,7 +2547,7 @@ msgstr "preciso de uma op
 msgid "--%s --pending does not take any non-option arguments"
 msgstr "--%s --pending não precisa de nenhum argumento que não seja opção"
 
-#: src/packages.c:109 src/query.c:317
+#: src/packages.c:109 src/query.c:321
 #, c-format
 msgid "--%s needs at least one package name argument"
 msgstr "--%s precisa de ao menos um nome de pacote como argumento"
@@ -2861,80 +2862,80 @@ msgstr "Vers
 msgid "Description"
 msgstr "Descrição"
 
-#: src/query.c:220 src/query.c:442 src/select.c:80
+#: src/query.c:218 src/query.c:446 src/select.c:80
 #, c-format
 msgid "No packages found matching %s.\n"
 msgstr "Nenhum pacote encontrado casando com %s.\n"
 
-#: src/query.c:236
+#: src/query.c:240
 #, c-format
 msgid "diversion by %s"
 msgstr "desvio por %s"
 
-#: src/query.c:237
+#: src/query.c:241
 #, c-format
 msgid "local diversion"
 msgstr "desvio local"
 
-#: src/query.c:238
+#: src/query.c:242
 msgid "to"
 msgstr "para"
 
-#: src/query.c:238
+#: src/query.c:242
 msgid "from"
 msgstr "de"
 
-#: src/query.c:271
+#: src/query.c:275
 msgid "--search needs at least one file name pattern argument"
 msgstr ""
 "--search precisa de ao menos um padrão de nome de arquivo como argumento"
 
-#: src/query.c:299
+#: src/query.c:303
 #, c-format
 msgid "dpkg: %s not found.\n"
 msgstr "dpkg: %s não encontrado.\n"
 
-#: src/query.c:337
+#: src/query.c:341
 #, c-format
 msgid "Package `%s' is not installed and no info is available.\n"
 msgstr "Pacote `%s' não está instalado e não há informações disponíveis.\n"
 
-#: src/query.c:346
+#: src/query.c:350
 #, c-format
 msgid "Package `%s' is not available.\n"
 msgstr "Pacote `%s' não está disponível.\n"
 
-#: src/query.c:356
+#: src/query.c:360
 #, c-format
 msgid "Package `%s' is not installed.\n"
 msgstr "Pacote `%s' não está instalado.\n"
 
-#: src/query.c:365
+#: src/query.c:369
 #, c-format
 msgid "Package `%s' does not contain any files (!)\n"
 msgstr "Pacote `%s' não contém arquivos (!)\n"
 
-#: src/query.c:371
+#: src/query.c:375
 #, c-format
 msgid "locally diverted"
 msgstr "localmente desviado"
 
-#: src/query.c:372
+#: src/query.c:376
 #, c-format
 msgid "package diverts others"
 msgstr "pacote desvia outros"
 
-#: src/query.c:373
+#: src/query.c:377
 #, c-format
 msgid "diverted by %s"
 msgstr "desviado por %s"
 
-#: src/query.c:374
+#: src/query.c:378
 #, c-format
 msgid " to: %s\n"
 msgstr " para: %s\n"
 
-#: src/query.c:393
+#: src/query.c:397
 msgid ""
 "Use dpkg --info (= dpkg-deb --info) to examine archive files,\n"
 "and dpkg --contents (= dpkg-deb --contents) to list their contents.\n"
@@ -2942,20 +2943,20 @@ 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:454 dpkg-deb/main.c:46
+#: src/query.c:458 dpkg-deb/main.c:46
 msgid "Debian `"
 msgstr "Debian GNU/Linux `"
 
-#: src/query.c:456
+#: src/query.c:460
 msgid "' package management program query tool\n"
 msgstr "' ferramento de procura do programa de gerenciamento de pacotes\n"
 
-#: src/query.c:468
+#: src/query.c:472
 #, c-format
 msgid "Usage: "
 msgstr "Uso: "
 
-#: src/query.c:469
+#: src/query.c:473
 #, fuzzy, c-format
 msgid ""
 " [<option>] <command>\n"
@@ -3018,7 +3019,7 @@ msgstr ""
 "GPL).\n"
 "\n"
 
-#: src/query.c:496
+#: src/query.c:500
 msgid ""
 "Use --help for help about querying packages;\n"
 "Use --licence for copyright licence and lack of warranty (GNU GPL).\n"
@@ -5459,6 +5460,7 @@ msgstr ""
 "Veja dpkg-deb --license para direitos autorais e detalhes de licença.\n"
 
 #: dpkg-deb/main.c:58
+#, fuzzy
 msgid ""
 "Command:\n"
 "  -b|--build <directory> [<deb>]    build an archive.\n"
@@ -5498,8 +5500,8 @@ msgid ""
 "   case left alignment will be used. \n"
 "\n"
 "Use `dpkg' to install and remove packages from your system, or\n"
-"`dselect' for user-friendly package management.  Packages unpacked\n"
-"using `dpkg-deb --extract' will be incorrectly installed !\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"


+ 33 - 31
po/ru.po

@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ru\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2005-03-18 16:22+0000\n"
+"POT-Creation-Date: 2005-03-21 03:11+0000\n"
 "PO-Revision-Date: 2005-01-01 11:38+0400\n"
 "Last-Translator: Yuri Kozlov <yuray@id.ru>\n"
 "Language-Team: Russian <debian-l10n-russian@lists.debian.org>\n"
@@ -2184,7 +2184,7 @@ msgstr "Debian GNU/Linux: "
 msgid "' package management program version "
 msgstr ", система управления пакетами версии "
 
-#: src/main.c:48 src/query.c:458
+#: src/main.c:48 src/query.c:462
 msgid ""
 "This is free software; see the GNU General Public Licence version 2 or\n"
 "later for copying conditions.  There is NO warranty.\n"
@@ -2196,7 +2196,7 @@ msgstr ""
 "информацию\n"
 "об авторских правах и условиях лицензии, выполните команду"
 
-#: src/main.c:50 src/query.c:460
+#: src/main.c:50 src/query.c:464
 msgid " --licence for copyright and license details.\n"
 msgstr " --licence.\n"
 
@@ -2264,7 +2264,7 @@ msgid ""
 " 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"
+"Use `dselect' or `aptitude' for user-friendly package management.\n"
 msgstr ""
 "Вызов: \n"
 "  dpkg -i|--install      <имя файла .deb> ... | -R|--recursive "
@@ -2367,9 +2367,10 @@ msgstr ""
 "управления пакетами.\n"
 
 #: src/main.c:119
+#, fuzzy
 msgid ""
 "Type dpkg --help for help about installing and deinstalling packages [*];\n"
-"Use dselect for user-friendly package management;\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"
@@ -2394,7 +2395,7 @@ msgstr ""
 "Параметры, отмеченные [*], выводят большое количество информации.\n"
 "Объедините их в конвейер с программами less или more!"
 
-#: src/main.c:184 src/query.c:526 dpkg-deb/main.c:162 dpkg-split/main.c:145
+#: src/main.c:184 src/query.c:530 dpkg-deb/main.c:162 dpkg-split/main.c:145
 #, c-format
 msgid "conflicting actions --%s and --%s"
 msgstr "несовместимые действия --%s и --%s"
@@ -2605,7 +2606,7 @@ msgstr "не удалось открыть поток дескриптора ф
 msgid "unexpected eof before end of line %d"
 msgstr "неожиданный конец файла, ещё не кончилась строка %d"
 
-#: src/main.c:557 src/main.c:572 src/query.c:561 dpkg-deb/main.c:184
+#: src/main.c:557 src/main.c:572 src/query.c:565 dpkg-deb/main.c:184
 #: dpkg-split/main.c:157
 msgid "need an action option"
 msgstr "требуется параметр действия"
@@ -2615,7 +2616,7 @@ msgstr "требуется параметр действия"
 msgid "--%s --pending does not take any non-option arguments"
 msgstr "--%s --pending не принимает аргументов, помимо параметров"
 
-#: src/packages.c:109 src/query.c:317
+#: src/packages.c:109 src/query.c:321
 #, c-format
 msgid "--%s needs at least one package name argument"
 msgstr "--%s требует указания хотя бы одного имени пакета"
@@ -2926,81 +2927,81 @@ msgstr "Версия"
 msgid "Description"
 msgstr "Описание"
 
-#: src/query.c:220 src/query.c:442 src/select.c:80
+#: src/query.c:218 src/query.c:446 src/select.c:80
 #, c-format
 msgid "No packages found matching %s.\n"
 msgstr "Шаблону %s не соответствует ни один пакет.\n"
 
-#: src/query.c:236
+#: src/query.c:240
 #, c-format
 msgid "diversion by %s"
 msgstr "размещение файла изменено пакетом %s"
 
-#: src/query.c:237
+#: src/query.c:241
 #, c-format
 msgid "local diversion"
 msgstr "локальное изменение размещения файлов"
 
-#: src/query.c:238
+#: src/query.c:242
 msgid "to"
 msgstr "на"
 
-#: src/query.c:238
+#: src/query.c:242
 msgid "from"
 msgstr "с"
 
-#: src/query.c:271
+#: src/query.c:275
 msgid "--search needs at least one file name pattern argument"
 msgstr ""
 "--search требует задания в качестве аргумента хотя бы одного шаблона имён "
 "файлов"
 
-#: src/query.c:299
+#: src/query.c:303
 #, c-format
 msgid "dpkg: %s not found.\n"
 msgstr "dpkg: файл %s не найден.\n"
 
-#: src/query.c:337
+#: src/query.c:341
 #, c-format
 msgid "Package `%s' is not installed and no info is available.\n"
 msgstr "Пакет %s не установлен, информация о нём недоступна.\n"
 
-#: src/query.c:346
+#: src/query.c:350
 #, c-format
 msgid "Package `%s' is not available.\n"
 msgstr "Пакет %s недоступен.\n"
 
-#: src/query.c:356
+#: src/query.c:360
 #, c-format
 msgid "Package `%s' is not installed.\n"
 msgstr "Пакет %s не установлен.\n"
 
-#: src/query.c:365
+#: src/query.c:369
 #, c-format
 msgid "Package `%s' does not contain any files (!)\n"
 msgstr "Пакет %s не содержит файлов (!)\n"
 
-#: src/query.c:371
+#: src/query.c:375
 #, c-format
 msgid "locally diverted"
 msgstr "размещение файла изменено тем же пакетом"
 
-#: src/query.c:372
+#: src/query.c:376
 #, c-format
 msgid "package diverts others"
 msgstr "пакет изменяет размещение файла другого пакета"
 
-#: src/query.c:373
+#: src/query.c:377
 #, c-format
 msgid "diverted by %s"
 msgstr "размещение файла изменено пакетом %s"
 
-#: src/query.c:374
+#: src/query.c:378
 #, c-format
 msgid " to: %s\n"
 msgstr " на %s\n"
 
-#: src/query.c:393
+#: src/query.c:397
 msgid ""
 "Use dpkg --info (= dpkg-deb --info) to examine archive files,\n"
 "and dpkg --contents (= dpkg-deb --contents) to list their contents.\n"
@@ -3010,20 +3011,20 @@ msgstr ""
 "для вывода списка файлов в них -- команду dpkg--contents (dpkg-deb --"
 "contents).\n"
 
-#: src/query.c:454 dpkg-deb/main.c:46
+#: src/query.c:458 dpkg-deb/main.c:46
 msgid "Debian `"
 msgstr "Debian"
 
-#: src/query.c:456
+#: src/query.c:460
 msgid "' package management program query tool\n"
 msgstr ": обработчик запросов системы управления пакетами\n"
 
-#: src/query.c:468
+#: src/query.c:472
 #, c-format
 msgid "Usage: "
 msgstr "Вызов: "
 
-#: src/query.c:469
+#: src/query.c:473
 #, fuzzy, c-format
 msgid ""
 " [<option>] <command>\n"
@@ -3080,7 +3081,7 @@ msgstr ""
 "  ${поле[;ширина]}. Поля выравниваются по правому краю, если ширина\n"
 "  неотрицательна, и по левому в противном случае.\n"
 
-#: src/query.c:496
+#: src/query.c:500
 msgid ""
 "Use --help for help about querying packages;\n"
 "Use --licence for copyright licence and lack of warranty (GNU GPL).\n"
@@ -5535,6 +5536,7 @@ msgstr ""
 "информацию, выполните команду dpkg-deb --licence.\n"
 
 #: dpkg-deb/main.c:58
+#, fuzzy
 msgid ""
 "Command:\n"
 "  -b|--build <directory> [<deb>]    build an archive.\n"
@@ -5574,8 +5576,8 @@ msgid ""
 "   case left alignment will be used. \n"
 "\n"
 "Use `dpkg' to install and remove packages from your system, or\n"
-"`dselect' for user-friendly package management.  Packages unpacked\n"
-"using `dpkg-deb --extract' will be incorrectly installed !\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"


+ 33 - 31
po/sk.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dpkg 1.10\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2005-03-18 16:22+0000\n"
+"POT-Creation-Date: 2005-03-21 03:11+0000\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"
@@ -2129,7 +2129,7 @@ msgstr "Debian GNU/Linux `"
 msgid "' package management program version "
 msgstr "' verzia programu na údr¾bu balíkov "
 
-#: src/main.c:48 src/query.c:458
+#: src/main.c:48 src/query.c:462
 msgid ""
 "This is free software; see the GNU General Public Licence version 2 or\n"
 "later for copying conditions.  There is NO warranty.\n"
@@ -2141,7 +2141,7 @@ msgstr ""
 "neposkytuje.\n"
 "Pozrite "
 
-#: src/main.c:50 src/query.c:460
+#: src/main.c:50 src/query.c:464
 msgid " --licence for copyright and license details.\n"
 msgstr "--licencia pre copyright a detaily o licencii.\n"
 
@@ -2209,7 +2209,7 @@ msgid ""
 " 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"
+"Use `dselect' or `aptitude' for user-friendly package management.\n"
 msgstr ""
 "Pou¾itie: \n"
 "  dpkg -i|--install      <.deb názov súboru> ... | -R|--recursive "
@@ -2296,9 +2296,10 @@ msgstr ""
 "správe balíkov.\n"
 
 #: src/main.c:119
+#, fuzzy
 msgid ""
 "Type dpkg --help for help about installing and deinstalling packages [*];\n"
-"Use dselect for user-friendly package management;\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"
@@ -2318,7 +2319,7 @@ msgstr ""
 "\n"
 "Voµby oznaèené [*] produkujú rozsiahly výstup - pou¾ite `less' alebo `more' !"
 
-#: src/main.c:184 src/query.c:526 dpkg-deb/main.c:162 dpkg-split/main.c:145
+#: src/main.c:184 src/query.c:530 dpkg-deb/main.c:162 dpkg-split/main.c:145
 #, c-format
 msgid "conflicting actions --%s and --%s"
 msgstr "odporujúce si akcie --%s a --%s"
@@ -2501,7 +2502,7 @@ msgstr "nie je mo
 msgid "unexpected eof before end of line %d"
 msgstr "neèakaný koniec súboru pred koncom riadku %d"
 
-#: src/main.c:557 src/main.c:572 src/query.c:561 dpkg-deb/main.c:184
+#: src/main.c:557 src/main.c:572 src/query.c:565 dpkg-deb/main.c:184
 #: dpkg-split/main.c:157
 msgid "need an action option"
 msgstr "potrebujem zada» akciu"
@@ -2511,7 +2512,7 @@ msgstr "potrebujem zada
 msgid "--%s --pending does not take any non-option arguments"
 msgstr "--%s --pending neuznáva ¾iadne nevoliteµné argumenty"
 
-#: src/packages.c:109 src/query.c:317
+#: src/packages.c:109 src/query.c:321
 #, c-format
 msgid "--%s needs at least one package name argument"
 msgstr "--%s vy¾aduje aspoò jeden názov balíku "
@@ -2812,81 +2813,81 @@ msgstr "Verzia"
 msgid "Description"
 msgstr "Popis"
 
-#: src/query.c:220 src/query.c:442 src/select.c:80
+#: src/query.c:218 src/query.c:446 src/select.c:80
 #, c-format
 msgid "No packages found matching %s.\n"
 msgstr "Nena¹iel som ¾iadne balíky vyhovujúce %s.\n"
 
-#: src/query.c:236
+#: src/query.c:240
 #, c-format
 msgid "diversion by %s"
 msgstr "odsunutie balíkom %s"
 
-#: src/query.c:237
+#: src/query.c:241
 #, c-format
 msgid "local diversion"
 msgstr "lokálne odsunutie"
 
-#: src/query.c:238
+#: src/query.c:242
 msgid "to"
 msgstr "na"
 
-#: src/query.c:238
+#: src/query.c:242
 msgid "from"
 msgstr "z"
 
-#: src/query.c:271
+#: src/query.c:275
 msgid "--search needs at least one file name pattern argument"
 msgstr "--search potrebuje najmenej jeden argument vzorky názvu súboru"
 
-#: src/query.c:299
+#: src/query.c:303
 #, c-format
 msgid "dpkg: %s not found.\n"
 msgstr "dpkg: %s nebol nájdený.\n"
 
-#: src/query.c:337
+#: src/query.c:341
 #, c-format
 msgid "Package `%s' is not installed and no info is available.\n"
 msgstr ""
 "Balíèek `%s' nie je nain¹talovaný a nie sú o òom dostupné ¾iadne "
 "informácie.\n"
 
-#: src/query.c:346
+#: src/query.c:350
 #, c-format
 msgid "Package `%s' is not available.\n"
 msgstr "Balíèek  `%s' nie je dostupný.\n"
 
-#: src/query.c:356
+#: src/query.c:360
 #, c-format
 msgid "Package `%s' is not installed.\n"
 msgstr "Balíèek `%s' nie je nain¹talovaný.\n"
 
-#: src/query.c:365
+#: src/query.c:369
 #, c-format
 msgid "Package `%s' does not contain any files (!)\n"
 msgstr "Balíèek `%s' neobsahuje ¾iadne súbory (!)\n"
 
-#: src/query.c:371
+#: src/query.c:375
 #, c-format
 msgid "locally diverted"
 msgstr "lokálne odsunutý"
 
-#: src/query.c:372
+#: src/query.c:376
 #, c-format
 msgid "package diverts others"
 msgstr "balík odsúva ostatné"
 
-#: src/query.c:373
+#: src/query.c:377
 #, c-format
 msgid "diverted by %s"
 msgstr "odsunuté %s"
 
-#: src/query.c:374
+#: src/query.c:378
 #, c-format
 msgid " to: %s\n"
 msgstr " na: %s\n"
 
-#: src/query.c:393
+#: src/query.c:397
 msgid ""
 "Use dpkg --info (= dpkg-deb --info) to examine archive files,\n"
 "and dpkg --contents (= dpkg-deb --contents) to list their contents.\n"
@@ -2894,20 +2895,20 @@ 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:454 dpkg-deb/main.c:46
+#: src/query.c:458 dpkg-deb/main.c:46
 msgid "Debian `"
 msgstr "Debian `"
 
-#: src/query.c:456
+#: src/query.c:460
 msgid "' package management program query tool\n"
 msgstr "' dotazovací nástroj programu na správu balíkov\n"
 
-#: src/query.c:468
+#: src/query.c:472
 #, c-format
 msgid "Usage: "
 msgstr "Pou¾itie: "
 
-#: src/query.c:469
+#: src/query.c:473
 #, fuzzy, c-format
 msgid ""
 " [<option>] <command>\n"
@@ -2962,7 +2963,7 @@ msgstr ""
 "  Polia budú zarovnané doprava, ak bude ¹írka záporná, inak bude pou¾ité\n"
 "   zarovnanie doµava. \n"
 
-#: src/query.c:496
+#: src/query.c:500
 msgid ""
 "Use --help for help about querying packages;\n"
 "Use --licence for copyright licence and lack of warranty (GNU GPL).\n"
@@ -5390,6 +5391,7 @@ msgstr ""
 "informácií.\n"
 
 #: dpkg-deb/main.c:58
+#, fuzzy
 msgid ""
 "Command:\n"
 "  -b|--build <directory> [<deb>]    build an archive.\n"
@@ -5429,8 +5431,8 @@ msgid ""
 "   case left alignment will be used. \n"
 "\n"
 "Use `dpkg' to install and remove packages from your system, or\n"
-"`dselect' for user-friendly package management.  Packages unpacked\n"
-"using `dpkg-deb --extract' will be incorrectly installed !\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"


+ 33 - 31
po/sv.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dpkg 1.10\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2005-03-18 16:22+0000\n"
+"POT-Creation-Date: 2005-03-21 03:11+0000\n"
 "PO-Revision-Date: 2005-01-01 23:52+0100\n"
 "Last-Translator: Peter Karlsson <peterk@debian.org>\n"
 "Language-Team: Peter Karlsson <peterk@debian.org>\n"
@@ -2112,7 +2112,7 @@ msgstr "Debian GNU/Linux \""
 msgid "' package management program version "
 msgstr "\" pakethanteringsprogram version "
 
-#: src/main.c:48 src/query.c:458
+#: src/main.c:48 src/query.c:462
 msgid ""
 "This is free software; see the GNU General Public Licence version 2 or\n"
 "later for copying conditions.  There is NO warranty.\n"
@@ -2122,7 +2122,7 @@ msgstr ""
 "eller senare för kopieringsvillkor. Det finns INGEN garanti.\n"
 "Se "
 
-#: src/main.c:50 src/query.c:460
+#: src/main.c:50 src/query.c:464
 msgid " --licence for copyright and license details.\n"
 msgstr " --license för upphovsrättsliga och licenstekniska detaljer.\n"
 
@@ -2190,7 +2190,7 @@ msgid ""
 " 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"
+"Use `dselect' or `aptitude' for user-friendly package management.\n"
 msgstr ""
 "Användning: \n"
 "  dpkg -i|--install      <.deb-filnamn> ... | -R|--recursive <kat> ...\n"
@@ -2263,9 +2263,10 @@ msgstr ""
 "Använd \"dselect\" eller \"aptitude\" för användarvänlig pakethantering.\n"
 
 #: src/main.c:119
+#, fuzzy
 msgid ""
 "Type dpkg --help for help about installing and deinstalling packages [*];\n"
-"Use dselect for user-friendly package management;\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"
@@ -2286,7 +2287,7 @@ msgstr ""
 "Flaggor markerade med [*] ger mycket utdata - kör genom \"less\" eller \"more"
 "\"!"
 
-#: src/main.c:184 src/query.c:526 dpkg-deb/main.c:162 dpkg-split/main.c:145
+#: src/main.c:184 src/query.c:530 dpkg-deb/main.c:162 dpkg-split/main.c:145
 #, c-format
 msgid "conflicting actions --%s and --%s"
 msgstr "motstridiga val --%s och --%s"
@@ -2474,7 +2475,7 @@ msgstr "kunde inte 
 msgid "unexpected eof before end of line %d"
 msgstr "oväntat filslut före slut på rad %d"
 
-#: src/main.c:557 src/main.c:572 src/query.c:561 dpkg-deb/main.c:184
+#: src/main.c:557 src/main.c:572 src/query.c:565 dpkg-deb/main.c:184
 #: dpkg-split/main.c:157
 msgid "need an action option"
 msgstr "du har inte talat om vad som skall utföras"
@@ -2484,7 +2485,7 @@ msgstr "du har inte talat om vad som skall utf
 msgid "--%s --pending does not take any non-option arguments"
 msgstr "--%s --pending tar inga argument som inte är flaggor"
 
-#: src/packages.c:109 src/query.c:317
+#: src/packages.c:109 src/query.c:321
 #, c-format
 msgid "--%s needs at least one package name argument"
 msgstr "--%s behöver åtminstone ett paket som argument"
@@ -2786,79 +2787,79 @@ msgstr "Version"
 msgid "Description"
 msgstr "Beskrivning"
 
-#: src/query.c:220 src/query.c:442 src/select.c:80
+#: src/query.c:218 src/query.c:446 src/select.c:80
 #, c-format
 msgid "No packages found matching %s.\n"
 msgstr "Inga paket matchar %s.\n"
 
-#: src/query.c:236
+#: src/query.c:240
 #, c-format
 msgid "diversion by %s"
 msgstr "omdirigerat av %s"
 
-#: src/query.c:237
+#: src/query.c:241
 #, c-format
 msgid "local diversion"
 msgstr "lokal omdirigering"
 
-#: src/query.c:238
+#: src/query.c:242
 msgid "to"
 msgstr "till"
 
-#: src/query.c:238
+#: src/query.c:242
 msgid "from"
 msgstr "från"
 
-#: src/query.c:271
+#: src/query.c:275
 msgid "--search needs at least one file name pattern argument"
 msgstr "--search behöver åtminstone ett filnamnsmönsterargument"
 
-#: src/query.c:299
+#: src/query.c:303
 #, c-format
 msgid "dpkg: %s not found.\n"
 msgstr "dpkg: %s kunde ej hittas.\n"
 
-#: src/query.c:337
+#: src/query.c:341
 #, c-format
 msgid "Package `%s' is not installed and no info is available.\n"
 msgstr "Paketet \"%s\" är inte installerat och ingen information finns.\n"
 
-#: src/query.c:346
+#: src/query.c:350
 #, c-format
 msgid "Package `%s' is not available.\n"
 msgstr "Paketet \"%s\" är ej tillgängligt.\n"
 
-#: src/query.c:356
+#: src/query.c:360
 #, c-format
 msgid "Package `%s' is not installed.\n"
 msgstr "Paketet \"%s\" är ej installerat.\n"
 
-#: src/query.c:365
+#: src/query.c:369
 #, c-format
 msgid "Package `%s' does not contain any files (!)\n"
 msgstr "Paketet \"%s\" innehåller inga filer (!)\n"
 
-#: src/query.c:371
+#: src/query.c:375
 #, c-format
 msgid "locally diverted"
 msgstr "lokalt omdirigerad"
 
-#: src/query.c:372
+#: src/query.c:376
 #, c-format
 msgid "package diverts others"
 msgstr "paketet omdirigerar andra"
 
-#: src/query.c:373
+#: src/query.c:377
 #, c-format
 msgid "diverted by %s"
 msgstr "omdirigerad av %s"
 
-#: src/query.c:374
+#: src/query.c:378
 #, c-format
 msgid " to: %s\n"
 msgstr " till: %s\n"
 
-#: src/query.c:393
+#: src/query.c:397
 msgid ""
 "Use dpkg --info (= dpkg-deb --info) to examine archive files,\n"
 "and dpkg --contents (= dpkg-deb --contents) to list their contents.\n"
@@ -2866,20 +2867,20 @@ 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:454 dpkg-deb/main.c:46
+#: src/query.c:458 dpkg-deb/main.c:46
 msgid "Debian `"
 msgstr "Debian \""
 
-#: src/query.c:456
+#: src/query.c:460
 msgid "' package management program query tool\n"
 msgstr "\" frågeverktyg för pakethanteringsprogrammet\n"
 
-#: src/query.c:468
+#: src/query.c:472
 #, c-format
 msgid "Usage: "
 msgstr "Användning: "
 
-#: src/query.c:469
+#: src/query.c:473
 #, fuzzy, c-format
 msgid ""
 " [<option>] <command>\n"
@@ -2931,7 +2932,7 @@ 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:496
+#: src/query.c:500
 msgid ""
 "Use --help for help about querying packages;\n"
 "Use --licence for copyright licence and lack of warranty (GNU GPL).\n"
@@ -5344,6 +5345,7 @@ msgstr ""
 "Se dpkg-deb --licence för detaljer.\n"
 
 #: dpkg-deb/main.c:58
+#, fuzzy
 msgid ""
 "Command:\n"
 "  -b|--build <directory> [<deb>]    build an archive.\n"
@@ -5383,8 +5385,8 @@ msgid ""
 "   case left alignment will be used. \n"
 "\n"
 "Use `dpkg' to install and remove packages from your system, or\n"
-"`dselect' for user-friendly package management.  Packages unpacked\n"
-"using `dpkg-deb --extract' will be incorrectly installed !\n"
+"`dselect' or `aptitude' for user-friendly package management.  Packages\n"
+"unpacked using `dpkg-deb --extract' will be incorrectly installed !\n"
 msgstr ""
 "Kommandon:\n"
 "  -b|--build <katalog> [<deb>]    Bygg ett arkiv.\n"


+ 33 - 31
po/zh_CN.po

@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dpkg\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2005-03-18 16:22+0000\n"
+"POT-Creation-Date: 2005-03-21 03:11+0000\n"
 "PO-Revision-Date: 2005-02-07 05:27+1300\n"
 "Last-Translator: Tchaikov <chaisave@263.com>\n"
 "Language-Team: Chinese (simplified) <i18n-translation@lists.linux.net.cn>\n"
@@ -2077,7 +2077,7 @@ msgstr "Debian GNU/Linux “"
 msgid "' package management program version "
 msgstr "”软件包管理程序,版本 "
 
-#: src/main.c:48 src/query.c:458
+#: src/main.c:48 src/query.c:462
 msgid ""
 "This is free software; see the GNU General Public Licence version 2 or\n"
 "later for copying conditions.  There is NO warranty.\n"
@@ -2087,7 +2087,7 @@ msgstr ""
 "第二版或其更新的版本。该软件【不】提供任何担保。\n"
 "请通过执行 "
 
-#: src/main.c:50 src/query.c:460
+#: src/main.c:50 src/query.c:464
 msgid " --licence for copyright and license details.\n"
 msgstr " --licence 来查看版权和许可证的细节。\n"
 
@@ -2155,7 +2155,7 @@ msgid ""
 " 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"
+"Use `dselect' or `aptitude' for user-friendly package management.\n"
 msgstr ""
 "用法:\n"
 "  dpkg -i|--install      <.deb 文件的文件名> ... | -R|--recursive <目录"
@@ -2226,9 +2226,10 @@ msgstr ""
 "“dselect”提供了更为易用的的软件包管理工具。\n"
 
 #: src/main.c:119
+#, fuzzy
 msgid ""
 "Type dpkg --help for help about installing and deinstalling packages [*];\n"
-"Use dselect for user-friendly package management;\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"
@@ -2247,7 +2248,7 @@ msgstr ""
 "带有[*]的选项将会输出较大篇幅的文字 - 可使用管道将其输出连接"
 "到“less”或“more”!"
 
-#: src/main.c:184 src/query.c:526 dpkg-deb/main.c:162 dpkg-split/main.c:145
+#: src/main.c:184 src/query.c:530 dpkg-deb/main.c:162 dpkg-split/main.c:145
 #, c-format
 msgid "conflicting actions --%s and --%s"
 msgstr "操作之间有矛盾 -- %s 和 -- %s"
@@ -2433,7 +2434,7 @@ msgstr "无法打开“%i”,并把它作为字符流操作"
 msgid "unexpected eof before end of line %d"
 msgstr "在第 %d 行还未结束时,发现了预料之外的 eof"
 
-#: src/main.c:557 src/main.c:572 src/query.c:561 dpkg-deb/main.c:184
+#: src/main.c:557 src/main.c:572 src/query.c:565 dpkg-deb/main.c:184
 #: dpkg-split/main.c:157
 msgid "need an action option"
 msgstr "需要一个指示操作的选项"
@@ -2443,7 +2444,7 @@ msgstr "需要一个指示操作的选项"
 msgid "--%s --pending does not take any non-option arguments"
 msgstr "--%s --pending 不需任何不是选项的参数"
 
-#: src/packages.c:109 src/query.c:317
+#: src/packages.c:109 src/query.c:321
 #, c-format
 msgid "--%s needs at least one package name argument"
 msgstr "--%s 需要至少一个软件包名作为参数"
@@ -2737,79 +2738,79 @@ msgstr "版本"
 msgid "Description"
 msgstr "简介"
 
-#: src/query.c:220 src/query.c:442 src/select.c:80
+#: src/query.c:218 src/query.c:446 src/select.c:80
 #, c-format
 msgid "No packages found matching %s.\n"
 msgstr "没有找到与 %s 相匹配的软件包。\n"
 
-#: src/query.c:236
+#: src/query.c:240
 #, c-format
 msgid "diversion by %s"
 msgstr "转移(diversion)到了 %s"
 
-#: src/query.c:237
+#: src/query.c:241
 #, c-format
 msgid "local diversion"
 msgstr "本地转移项(local diversion)"
 
-#: src/query.c:238
+#: src/query.c:242
 msgid "to"
 msgstr "到"
 
-#: src/query.c:238
+#: src/query.c:242
 msgid "from"
 msgstr "从"
 
-#: src/query.c:271
+#: src/query.c:275
 msgid "--search needs at least one file name pattern argument"
 msgstr "--search 需要至少一个文件名表达式作为参数"
 
-#: src/query.c:299
+#: src/query.c:303
 #, c-format
 msgid "dpkg: %s not found.\n"
 msgstr "dpkg:没有找到 %s。\n"
 
-#: src/query.c:337
+#: src/query.c:341
 #, c-format
 msgid "Package `%s' is not installed and no info is available.\n"
 msgstr "系统没有安装软件包“%s”,因而没有相关的信息。\n"
 
-#: src/query.c:346
+#: src/query.c:350
 #, c-format
 msgid "Package `%s' is not available.\n"
 msgstr "软件包“%s”现在不可用。\n"
 
-#: src/query.c:356
+#: src/query.c:360
 #, c-format
 msgid "Package `%s' is not installed.\n"
 msgstr "未曾安装软件包“%s”。\n"
 
-#: src/query.c:365
+#: src/query.c:369
 #, c-format
 msgid "Package `%s' does not contain any files (!)\n"
 msgstr "软件包“%s”未含有任何文件(!)\n"
 
-#: src/query.c:371
+#: src/query.c:375
 #, c-format
 msgid "locally diverted"
 msgstr "本地转移(locally diverted)"
 
-#: src/query.c:372
+#: src/query.c:376
 #, c-format
 msgid "package diverts others"
 msgstr "软件包是其他软件包的转移项"
 
-#: src/query.c:373
+#: src/query.c:377
 #, c-format
 msgid "diverted by %s"
 msgstr "转移到了(diverted by) %s"
 
-#: src/query.c:374
+#: src/query.c:378
 #, c-format
 msgid " to: %s\n"
 msgstr " 转移文件现指向:%s\n"
 
-#: src/query.c:393
+#: src/query.c:397
 msgid ""
 "Use dpkg --info (= dpkg-deb --info) to examine archive files,\n"
 "and dpkg --contents (= dpkg-deb --contents) to list their contents.\n"
@@ -2817,20 +2818,20 @@ msgstr ""
 "使用 dpkg --info (= dpkg-deb --info) 来检测打包好的文件,\n"
 "还可以用过 dpkg --contents (= dpkg-deb --contents) 来列出它们的内容。\n"
 
-#: src/query.c:454 dpkg-deb/main.c:46
+#: src/query.c:458 dpkg-deb/main.c:46
 msgid "Debian `"
 msgstr "Debian “"
 
-#: src/query.c:456
+#: src/query.c:460
 msgid "' package management program query tool\n"
 msgstr "”软件包管理程序查询工具\n"
 
-#: src/query.c:468
+#: src/query.c:472
 #, c-format
 msgid "Usage: "
 msgstr "用法:"
 
-#: src/query.c:469
+#: src/query.c:473
 #, fuzzy, c-format
 msgid ""
 " [<option>] <command>\n"
@@ -2883,7 +2884,7 @@ msgstr ""
 "  字段一般是靠右对齐的,除非它的宽度是负数。若其宽度是负数,\n"
 "  那么字段将会靠左对齐。\n"
 
-#: src/query.c:496
+#: src/query.c:500
 msgid ""
 "Use --help for help about querying packages;\n"
 "Use --licence for copyright licence and lack of warranty (GNU GPL).\n"
@@ -5252,6 +5253,7 @@ msgstr ""
 "请通过执行 dpkg-deb --licence 来查看版权和许可证的细节。\n"
 
 #: dpkg-deb/main.c:58
+#, fuzzy
 msgid ""
 "Command:\n"
 "  -b|--build <directory> [<deb>]    build an archive.\n"
@@ -5291,8 +5293,8 @@ msgid ""
 "   case left alignment will be used. \n"
 "\n"
 "Use `dpkg' to install and remove packages from your system, or\n"
-"`dselect' for user-friendly package management.  Packages unpacked\n"
-"using `dpkg-deb --extract' will be incorrectly installed !\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"


+ 33 - 31
po/zh_TW.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: 2005-03-18 16:22+0000\n"
+"POT-Creation-Date: 2005-03-21 03:11+0000\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"
@@ -2074,7 +2074,7 @@ msgstr "Debian GNU/Linux “"
 msgid "' package management program version "
 msgstr "”套件管理程式版本 "
 
-#: src/main.c:48 src/query.c:458
+#: src/main.c:48 src/query.c:462
 msgid ""
 "This is free software; see the GNU General Public Licence version 2 or\n"
 "later for copying conditions.  There is NO warranty.\n"
@@ -2084,7 +2084,7 @@ msgstr ""
 "第二版或其更新的版本。該軟體【不】提供任何擔保。\n"
 "請通過執行 "
 
-#: src/main.c:50 src/query.c:460
+#: src/main.c:50 src/query.c:464
 msgid " --licence for copyright and license details.\n"
 msgstr " --licence 來查看版權和許可証的細節。\n"
 
@@ -2152,7 +2152,7 @@ msgid ""
 " 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"
+"Use `dselect' or `aptitude' for user-friendly package management.\n"
 msgstr ""
 "用法:\n"
 "  dpkg -i|--install      <.deb 檔案> ... | -R|--recursive <目錄> ...\n"
@@ -2217,9 +2217,10 @@ msgstr ""
 "“dselect”提供了更容易使用的套件管理工具。\n"
 
 #: src/main.c:119
+#, fuzzy
 msgid ""
 "Type dpkg --help for help about installing and deinstalling packages [*];\n"
-"Use dselect for user-friendly package management;\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"
@@ -2237,7 +2238,7 @@ msgstr ""
 "輸入 dpkg --licence 可閱讀版權、許可証和無擔保的說明 (GNU GPL)[*]。\n"
 "帶有[*]的選項將會輸出較大篇幅的文字 - 可使用管線將其輸出到“less”或“more”!"
 
-#: src/main.c:184 src/query.c:526 dpkg-deb/main.c:162 dpkg-split/main.c:145
+#: src/main.c:184 src/query.c:530 dpkg-deb/main.c:162 dpkg-split/main.c:145
 #, c-format
 msgid "conflicting actions --%s and --%s"
 msgstr "操作之間有矛盾 -- %s 和 -- %s"
@@ -2421,7 +2422,7 @@ msgstr "無法打開“%i”,並把它作為串流處理"
 msgid "unexpected eof before end of line %d"
 msgstr "在第 %d 行還未結束時,發現了預料之外的 eof"
 
-#: src/main.c:557 src/main.c:572 src/query.c:561 dpkg-deb/main.c:184
+#: src/main.c:557 src/main.c:572 src/query.c:565 dpkg-deb/main.c:184
 #: dpkg-split/main.c:157
 msgid "need an action option"
 msgstr "需要一個指示操作的選項"
@@ -2431,7 +2432,7 @@ msgstr "需要一個指示操作的選項"
 msgid "--%s --pending does not take any non-option arguments"
 msgstr "--%s --pending 不需任何不是選項的參數"
 
-#: src/packages.c:109 src/query.c:317
+#: src/packages.c:109 src/query.c:321
 #, c-format
 msgid "--%s needs at least one package name argument"
 msgstr "--%s 需要至少一個套件名稱作為參數"
@@ -2725,79 +2726,79 @@ msgstr "版本"
 msgid "Description"
 msgstr "簡介"
 
-#: src/query.c:220 src/query.c:442 src/select.c:80
+#: src/query.c:218 src/query.c:446 src/select.c:80
 #, c-format
 msgid "No packages found matching %s.\n"
 msgstr "沒有找到與 %s 相匹配的套件。\n"
 
-#: src/query.c:236
+#: src/query.c:240
 #, c-format
 msgid "diversion by %s"
 msgstr "轉移(diversion)到了 %s"
 
-#: src/query.c:237
+#: src/query.c:241
 #, c-format
 msgid "local diversion"
 msgstr "本地轉移項(local diversion)"
 
-#: src/query.c:238
+#: src/query.c:242
 msgid "to"
 msgstr "到"
 
-#: src/query.c:238
+#: src/query.c:242
 msgid "from"
 msgstr "從"
 
-#: src/query.c:271
+#: src/query.c:275
 msgid "--search needs at least one file name pattern argument"
 msgstr "--search 需要至少一個檔案名稱表達式作為參數"
 
-#: src/query.c:299
+#: src/query.c:303
 #, c-format
 msgid "dpkg: %s not found.\n"
 msgstr "dpkg:沒有找到 %s。\n"
 
-#: src/query.c:337
+#: src/query.c:341
 #, c-format
 msgid "Package `%s' is not installed and no info is available.\n"
 msgstr "系統沒有安裝套件“%s”,因而沒有相關的訊息。\n"
 
-#: src/query.c:346
+#: src/query.c:350
 #, c-format
 msgid "Package `%s' is not available.\n"
 msgstr "套件“%s”現在不可用。\n"
 
-#: src/query.c:356
+#: src/query.c:360
 #, c-format
 msgid "Package `%s' is not installed.\n"
 msgstr "未曾安裝套件“%s”。\n"
 
-#: src/query.c:365
+#: src/query.c:369
 #, c-format
 msgid "Package `%s' does not contain any files (!)\n"
 msgstr "套件“%s”未含有任何檔案(!)\n"
 
-#: src/query.c:371
+#: src/query.c:375
 #, c-format
 msgid "locally diverted"
 msgstr "本地轉移(locally diverted)"
 
-#: src/query.c:372
+#: src/query.c:376
 #, c-format
 msgid "package diverts others"
 msgstr "套件是其他套件的轉移項"
 
-#: src/query.c:373
+#: src/query.c:377
 #, c-format
 msgid "diverted by %s"
 msgstr "轉移到了(diverted by) %s"
 
-#: src/query.c:374
+#: src/query.c:378
 #, c-format
 msgid " to: %s\n"
 msgstr " 轉移檔案現指向:%s\n"
 
-#: src/query.c:393
+#: src/query.c:397
 msgid ""
 "Use dpkg --info (= dpkg-deb --info) to examine archive files,\n"
 "and dpkg --contents (= dpkg-deb --contents) to list their contents.\n"
@@ -2805,20 +2806,20 @@ msgstr ""
 "使用 dpkg --info (= dpkg-deb --info) 來檢測打包好的檔案,\n"
 "還可以用過 dpkg --contents (= dpkg-deb --contents) 來列出它們的內容。\n"
 
-#: src/query.c:454 dpkg-deb/main.c:46
+#: src/query.c:458 dpkg-deb/main.c:46
 msgid "Debian `"
 msgstr "Debian “"
 
-#: src/query.c:456
+#: src/query.c:460
 msgid "' package management program query tool\n"
 msgstr "”套件管理程序查詢工具\n"
 
-#: src/query.c:468
+#: src/query.c:472
 #, c-format
 msgid "Usage: "
 msgstr "用法:"
 
-#: src/query.c:469
+#: src/query.c:473
 #, fuzzy, c-format
 msgid ""
 " [<option>] <command>\n"
@@ -2870,7 +2871,7 @@ msgstr ""
 "  欄位一般是靠右對齊的,除非它的寬度是負數。若其寬度是負數,\n"
 "  那麼欄位將會靠左對齊。\n"
 
-#: src/query.c:496
+#: src/query.c:500
 msgid ""
 "Use --help for help about querying packages;\n"
 "Use --licence for copyright licence and lack of warranty (GNU GPL).\n"
@@ -5234,6 +5235,7 @@ msgstr ""
 "請通過執行 dpkg-deb --licence 來查看版權和許可証的細節。\n"
 
 #: dpkg-deb/main.c:58
+#, fuzzy
 msgid ""
 "Command:\n"
 "  -b|--build <directory> [<deb>]    build an archive.\n"
@@ -5273,8 +5275,8 @@ msgid ""
 "   case left alignment will be used. \n"
 "\n"
 "Use `dpkg' to install and remove packages from your system, or\n"
-"`dselect' for user-friendly package management.  Packages unpacked\n"
-"using `dpkg-deb --extract' will be incorrectly installed !\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"

+ 2 - 2
scripts/changelog/debian.pl

@@ -42,7 +42,7 @@ while (@ARGV) {
 
 %mapkv=(); # for future use
 $i=100;grep($fieldimps{$_}=$i--,
-          qw(Source Version Distribution Urgency Changed-By Date Closes
+          qw(Source Version Distribution Urgency Maintainer Date Closes
 	     Changes));
 $i=1;grep($urgencies{$_}=$i++,
           qw(low medium high critical emergency));
@@ -111,7 +111,7 @@ while (<STDIN>) {
     } elsif (m/^ \-\- (.*) <(.*)>  ((\w+\,\s*)?\d{1,2}\s+\w+\s+\d{4}\s+\d{1,2}:\d\d:\d\d\s+[-+]\d{4}(\s+\([^\\\(\)]\))?)$/) {
         $expect eq 'more change data or trailer' ||
             &clerror("found trailer where expected $expect");
-        $f{'Changed-By'}= "$1 <$2>" unless defined($f{'Changed-By'});
+        $f{'Maintainer'}= "$1 <$2>" unless defined($f{'Maintainer'});
         $f{'Date'}= $3 unless defined($f{'Date'});
 #        $f{'Changes'}.= " .\n $_\n";
         $expect= 'next heading or eof';

+ 1 - 2
scripts/controllib.pl

@@ -304,8 +304,7 @@ sub parsecdata {
 
 sub unknown {
     my $field = $_;
-    my $key = (grep { /^o:C\d+ $field/ } keys %fi)[0];
-    &warn("unknown information field " . $f{"$key"} . " in input data in $_[0]");
+    &warn("unknown information field \`$field\' in input data in $_[0]");
 }
 
 sub syntax {

+ 6 - 6
scripts/dpkg-buildpackage.sh

@@ -134,18 +134,18 @@ mustsetvar () {
 		echo >&2 "$progname: unable to determine $3" ; \
 		exit 1
 	else
-		echo "$progname: $3 is $2" ; \
+		echo "$progname: $3 $2" ; \
 		eval "$1=\"\$2\""
 	fi
 }
 
 curd="`pwd`"
 dirn="`basename \"$curd\"`"
-mustsetvar package "`dpkg-parsechangelog | sed -n 's/^Source: //p'`" "source package"
-mustsetvar version "`dpkg-parsechangelog | sed -n 's/^Version: //p'`" "source version"
-if [ -n "$changedby" ]; then maintainer="$changedby"; 
-elif [ -n "$maint" ]; then maintainer="$maint"; 
-else mustsetvar maintainer "`dpkg-parsechangelog | sed -n 's/^Maintainer: //p'`" "source maintainer"; fi
+mustsetvar package "`dpkg-parsechangelog | sed -n 's/^Source: //p'`" "source package is"
+mustsetvar version "`dpkg-parsechangelog | sed -n 's/^Version: //p'`" "source version is"
+if [ -n "$changedby" ]; then maintainer="$changedby";
+elif [ -n "$maint" ]; then maintainer="$maint";
+else mustsetvar maintainer "`dpkg-parsechangelog | sed -n 's/^Maintainer: //p'`" "source changed by"; fi
 eval `dpkg-architecture -a${targetarch} -t${targetgnusystem} -s -f`
 
 if [ x$sourceonly = x ]; then

+ 1 - 1
scripts/dpkg-gencontrol.pl

@@ -242,7 +242,7 @@ if (open(X,"< $fileslistfile")) {
     binmode(X);
     while (<X>) {
         chomp;
-        next if m/^([-+0-9a-z.]+)_[^_]+_(\w+)\.deb /
+        next if m/^([-+0-9a-z.]+)_[^_]+_([\w-]+)\.deb /
                 && ($1 eq $oppackage) && ($2 eq $arch || $2 eq 'all');
         print(Y "$_\n") || &syserr("copy old entry to new files list file");
     }

+ 1 - 1
scripts/dpkg-scansources.pl

@@ -110,7 +110,7 @@ sub usage {
 # Getopt::Long has some really awful defaults.  This function loads it
 # then configures it to use more sane settings.
 
-sub getopt;
+sub getopt(@);
 sub configure_getopt {
     Getopt::Long->import(2.11);
     *getopt = \&Getopt::Long::GetOptions;

+ 2 - 2
src/main.c

@@ -110,7 +110,7 @@ Comparison operators for --compare-versions are:\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"),
+Use `dselect' or `aptitude' for user-friendly package management.\n"),
 	    BACKEND, ADMINDIR) < 0) werr ("stdout");
 }
 
@@ -118,7 +118,7 @@ const char thisname[]= "dpkg";
 const char architecture[]= ARCHITECTURE;
 const char printforhelp[]= N_("\
 Type dpkg --help for help about installing and deinstalling packages [*];\n\
-Use dselect for user-friendly package management;\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\

+ 11 - 7
src/query.c

@@ -183,9 +183,9 @@ Desired=Unknown/Install/Remove/Purge/Hold\n\
 void listpackages(const char *const *argv) {
   struct pkgiterator *it;
   struct pkginfo *pkg;
-  struct pkginfo **pkgl;
+  struct pkginfo **pkgl, **pkgf;
   const char *thisarg;
-  int np, i, head, found;
+  int np, nf, i, head, found;
 
   modstatdb_init(admindir,msdbrw_readonly);
 
@@ -199,14 +199,12 @@ void listpackages(const char *const *argv) {
   iterpkgend(it);
   assert(i==np);
 
-  qsort(pkgl,np,sizeof(struct pkginfo*),pkglistqsortcmp);
-  head=0;
-
+  pkgf= m_malloc(sizeof(struct pkginfo*)*np); nf=0;
   if (!*argv) {
     for (i=0; i<np; i++) {
       pkg= pkgl[i];
       if (pkg->status == stat_notinstalled) continue;
-      list1package(pkg,&head,pkgl,np);
+      pkgf[nf++] = pkg;
     }
   } else {
     while ((thisarg= *argv++)) {
@@ -214,7 +212,7 @@ void listpackages(const char *const *argv) {
       for (i=0; i<np; i++) {
         pkg= pkgl[i];
         if (fnmatch(thisarg,pkg->name,0)) continue;
-        list1package(pkg,&head,pkgl,np); found++;
+	pkgf[nf++] = pkg; found++;
       }
       if (!found) {
         fprintf(stderr,_("No packages found matching %s.\n"),thisarg);
@@ -222,6 +220,12 @@ void listpackages(const char *const *argv) {
       }
     }
   }
+
+  qsort(pkgf,nf,sizeof(struct pkginfo*),pkglistqsortcmp);
+  head=0;
+  for (i=0; i<nf; i++)
+    list1package(pkgf[i],&head,pkgf,nf);
+
   if (ferror(stdout)) werr("stdout");
   if (ferror(stderr)) werr("stderr");  
   modstatdb_shutdown();