Release 1.10.22

Patches applied:

 * scott@netsplit.com--2004/dpkg--devo--1.10--base-0
   tag of scott@netsplit.com--2004/dpkg--cvs--1.10--patch-222

 * scott@netsplit.com--2004/dpkg--devo--1.10--patch-1
   make start-stop-daemon work on hurd

 * scott@netsplit.com--2004/dpkg--devo--1.10--patch-2
   merge changes from svn

 * scott@netsplit.com--2004/dpkg--devo--1.10--patch-3
   use colouring to break dep cycles

 * scott@netsplit.com--2004/dpkg--devo--1.10--patch-4
   fix some *really* bad missing brace errors

 * scott@netsplit.com--2004/dpkg--devo--1.10--patch-5
   add archtable support for GNU/kNetBSD and fix GNU/kFreeBSD.

 * scott@netsplit.com--2004/dpkg--devo--1.10--patch-6
   add missing debian/changelog entries

 * scott@netsplit.com--2004/dpkg--devo--1.10--patch-7
   more changelog fixing

 * scott@netsplit.com--2004/dpkg--devo--1.10--patch-8
   fix some compiler warnings

 * scott@netsplit.com--2004/dpkg--devo--1.10--patch-9
   change amd64 to x86-64

 * scott@netsplit.com--2004/dpkg--devo--1.10--patch-10
   update italian translation

 * scott@netsplit.com--2004/dpkg--devo--1.10--patch-11
   reformatted debian/changelog

 * scott@netsplit.com--2004/dpkg--devo--1.10--patch-12
   updated spanish dpkg-divert.8 manpage

 * scott@netsplit.com--2004/dpkg--devo--1.10--patch-13
   new german start-stop-daemon manpage

 * scott@netsplit.com--2004/dpkg--devo--1.10--patch-14
   updated russian manpage

 * scott@netsplit.com--2004/dpkg--devo--1.10--patch-15
   update japanese manpages

 * scott@netsplit.com--2004/dpkg--devo--1.10--patch-16
   fix wrong bug#

 * scott@netsplit.com--2004/dpkg--devo--1.10--patch-17
   quote LDFLAGS in debian/rules

 * scott@netsplit.com--2004/dpkg--devo--1.10--patch-18
   document dpkg:Version and dpkg:UpstreamVersion substvars.

 * scott@netsplit.com--2004/dpkg--devo--1.10--patch-19
   allow dpkg-shlibdeps to run as root by guarding chown

 * scott@netsplit.com--2004/dpkg--devo--1.10--patch-20
   move dpkg-scanpackages(8) and dpkg-scansources(8) into (1)

 * scott@netsplit.com--2004/dpkg--devo--1.10--patch-21
   Release 1.10.22

 * scott@netsplit.com--2004/dpkg--svn--1.10--patch-95
   (merge patch logs from dpkg--cvs--1.10)

 * scott@netsplit.com--2004/dpkg--svn--1.10--patch-97
   main/packages.c: Apply patch from Daniel Kobras to disappear empty pac...

 * scott@netsplit.com--2004/dpkg--svn--1.10--patch-98
   spelling error fix


* scripts/Makefile.in: Move dpkg-scanpackages and dpkg-scansources
manpages to section 1.
* scripts/dpkg-scanpackages.8: Renamed to dpkg-scanpackages.1, adjusted
reference to dpkg-scansources.
* scripts/dpkg-scansources.pl: Adjusted reference to dpkg-scanpackages.
* dselect/dselect.8: Adjusted reference to dpkg-scanpackages.

* man/es/Makefile.in: Move dpkg-scanpackages and dpkg-scansources
manpages to section 1.
* man/es/dpkg-scanpackages.8: Renamed to dpkg-scanpackages.1, adjusted
reference to dpkg-scansources.
* man/es/dpkg-scansources.8: Renamed to dpkg-scansources.1,

* man/fr/Makefile.in: Move dpkg-scanpackages and dpkg-scansources
manpages to section 1.
* man/fr/dpkg-scanpackages.8: Renamed to dpkg-scanpackages.1, adjusted
reference to dpkg-scansources.
* man/fr/dpkg-scansources.8: Renamed to dpkg-scansources.1

* man/ja/Makefile.in: Move dpkg-scanpackages and dpkg-scansources
manpages to section 1.
* man/ja/dpkg-scanpackages.8: Renamed to dpkg-scanpackages.1, adjusted
refence to dpkg-scansources.
* man/ja/dpkg-scansources.8: Renamed to dpkg-scansources.1, adjusted
reference to dpkg-scanpackages.
* man/ja/dselect.8: Adjusted references to dpkg-scanpackages.

* man/pt_BR/dselect.8: Adjusted reference to dpkg-scanpackages.
* man/sv/.check.pl: Adjusted reference to dpkg-scanpackages.
* man/sv/dselect.8: Adjusted reference to dpkg-scanpackages.

* scripts/dpkg-shlibdeps.pl: Guard chown call with a check that we're
running as root, if we're not, it's not necessary.

* script/dpkg-source.1: Documented dpkg:Version and dpkg:UpstreamVersion
substvars.

* man/ja/dpkg-checkbuilddeps.1: Updated.
* man/ja/dpkg-divert.8: Updated.

* po/ru.po: Updated.

* man/de/start-stop-daemon.8: New translation.
* man/de/Makefile.in: Added new manpage.

* man/es/dpkg-divert.8: Updated.

* po/it.po: Updated.

* archtable: Change amd64 to x86-64 or x86_64 to match the GNU strings
until someone better than me makes a real decision about this.
* scripts/dpkg-architecture.pl: Likewise.

* dpkg-deb/extract.c: Swap %zi and %ld in printf expression.
* split/info.c: Correct %zi and %lu in printf expression.
* split/main.c: Include missing sys/types.h and sys/stat.h headers.

* archtable: Change i386-kfreebsd-gnu to kfreebsd-i386 and add
i386-knetbsd-gnu.
* scripts/dpkg-archtable.pl: Return i386-freebsd for freebsd-i386 and
i386-kfreebsd-gnu for kfreebsd-i386 instead.  Add knetbsd-i386.
* configure.in: Identify knetbsd-gnu.

* main/depcon.c: Colour packages as we check them for break cycles to
reduce the amount of recursion required to break a cycle.
* include/dpkg-deb.h, lib/database.c: Add colour to the package structure.
* main/main.h, main/configure.c, main/remove.c: Remove second
argument from findbreakcycle() function.

* utils/start-stop-daemon.c: On hurd, proc_stat_set_flags may return
NULL as Hurd can have processes with no uid, replace ihash_iterate
with HURD_IHASH_ITERATE.

* utils/md5sum.1: s/asterix/asterisk/.  Thanks to Matt Zimmermann for
noticing this.

* main/packages.c: Apply patch from Daniel Kobras to disappear empty
packages that are replaced in the same run.

ChangeLog

@@ -1,3 +1,112 @@
+Tue Jun 1 17:42:58 BRT 2004 Scott James Remnant <scott@netsplit.com>
+
+  * scripts/Makefile.in: Move dpkg-scanpackages and dpkg-scansources
+  manpages to section 1.
+  * scripts/dpkg-scanpackages.8: Renamed to dpkg-scanpackages.1, adjusted
+  reference to dpkg-scansources.
+  * scripts/dpkg-scansources.pl: Adjusted reference to dpkg-scanpackages.
+  * dselect/dselect.8: Adjusted reference to dpkg-scanpackages.
+
+  * man/es/Makefile.in: Move dpkg-scanpackages and dpkg-scansources
+  manpages to section 1.
+  * man/es/dpkg-scanpackages.8: Renamed to dpkg-scanpackages.1, adjusted
+  reference to dpkg-scansources.
+  * man/es/dpkg-scansources.8: Renamed to dpkg-scansources.1,
+
+  * man/fr/Makefile.in: Move dpkg-scanpackages and dpkg-scansources
+  manpages to section 1.
+  * man/fr/dpkg-scanpackages.8: Renamed to dpkg-scanpackages.1, adjusted
+  reference to dpkg-scansources.
+  * man/fr/dpkg-scansources.8: Renamed to dpkg-scansources.1
+
+  * man/ja/Makefile.in: Move dpkg-scanpackages and dpkg-scansources
+  manpages to section 1.
+  * man/ja/dpkg-scanpackages.8: Renamed to dpkg-scanpackages.1, adjusted
+  refence to dpkg-scansources.
+  * man/ja/dpkg-scansources.8: Renamed to dpkg-scansources.1, adjusted
+  reference to dpkg-scanpackages.
+  * man/ja/dselect.8: Adjusted references to dpkg-scanpackages.
+
+  * man/pt_BR/dselect.8: Adjusted reference to dpkg-scanpackages.
+  * man/sv/.check.pl: Adjusted reference to dpkg-scanpackages.
+  * man/sv/dselect.8: Adjusted reference to dpkg-scanpackages.
+
+Tue Jun 1 17:27:50 BRT 2004 Scott James Remnant <scott@netsplit.com>
+
+  * scripts/dpkg-shlibdeps.pl: Guard chown call with a check that we're
+  running as root, if we're not, it's not necessary.
+
+Tue Jun 1 17:23:30 BRT 2004 Scott James Remnant <scott@netsplit.com>
+
+  * script/dpkg-source.1: Documented dpkg:Version and dpkg:UpstreamVersion
+  substvars.
+
+Tue Jun 1 14:52:27 BRT 2004 KISE Hiroshi <kise@fuyuneko.jp>
+
+  * man/ja/dpkg-checkbuilddeps.1: Updated.
+  * man/ja/dpkg-divert.8: Updated.
+
+Tue Jun 1 14:45:47 BRT 2004 Nikolai Prokoschenko <nikolai@prokoschenko.de>
+
+  * po/ru.po: Updated.
+
+Tue Jun 1 14:41:30 BRT 2004 Helge Kreutzmann <kreutzm@itp.uni-hannover.de>
+
+  * man/de/start-stop-daemon.8: New translation.
+  * man/de/Makefile.in: Added new manpage.
+
+Tue Jun 1 14:37:52 BRT 2004 Ruben Porras <nahoo82@telefonica.net>
+
+  * man/es/dpkg-divert.8: Updated.
+
+Tue Jun 1 13:53:29 BRT 2004 Lele Gaifax <lele@nautilus.homeip.net>
+
+  * po/it.po: Updated.
+
+Mon May 31 20:44:21 BRT 2004 Scott James Remnant <scott@netsplit.com>
+
+  * archtable: Change amd64 to x86-64 or x86_64 to match the GNU strings
+  until someone better than me makes a real decision about this.
+  * scripts/dpkg-architecture.pl: Likewise.
+
+Mon May 31 12:48:35 BRT 2004 Michal Cihar <michal@cihar.com>
+
+  * dpkg-deb/extract.c: Swap %zi and %ld in printf expression.
+  * split/info.c: Correct %zi and %lu in printf expression.
+  * split/main.c: Include missing sys/types.h and sys/stat.h headers.
+
+Sun May 30 19:51:52 BRT 2004 Robert Millan <zeratul2@wanadoo.es>
+
+  * archtable: Change i386-kfreebsd-gnu to kfreebsd-i386 and add
+  i386-knetbsd-gnu.
+  * scripts/dpkg-archtable.pl: Return i386-freebsd for freebsd-i386 and
+  i386-kfreebsd-gnu for kfreebsd-i386 instead.  Add knetbsd-i386.
+  * configure.in: Identify knetbsd-gnu.
+
+Fri May 28 18:45:26 BRT 2004 Steinar H. Gunderson <sesse@dessverre.samfundet.no>
+
+  * main/depcon.c: Colour packages as we check them for break cycles to
+  reduce the amount of recursion required to break a cycle.
+  * include/dpkg-deb.h, lib/database.c: Add colour to the package structure.
+  * main/main.h, main/configure.c, main/remove.c: Remove second
+  argument from findbreakcycle() function.
+
+Wed May 26 23:05:01 BRT 2004 Ognyan Kulev <ogi@fmi.uni-sofia.bg>
+
+  * utils/start-stop-daemon.c: On hurd, proc_stat_set_flags may return
+  NULL as Hurd can have processes with no uid, replace ihash_iterate
+  with HURD_IHASH_ITERATE.
+
+Sat May 22 15:28:33 CEST 2004  Tollef Fog Heen  <tfheen@debian.org>
+
+  * utils/md5sum.1: s/asterix/asterisk/.  Thanks to Matt Zimmermann for
+  noticing this.
+
+Wed May 12 23:25:16 CEST 2004  Tollef Fog Heen  <tfheen@debian.org>
+
+  * main/packages.c: Apply patch from Daniel Kobras to disappear empty
+  packages that are replaced in the same run.
+
 Fri May 7 04:46:01 BST 2004 Scott James Remnant <scott@netsplit.com>
 
   * doc/Makefile.in: Ensure that $(docdir) exists before attempting

archtable

@@ -50,8 +50,9 @@ hppa1.1-linux-gnu		hppa		hppa
 hppa2.0-linux-gnu		hppa		hppa
 hppa64-linux-gnu		hppa		hppa
 i386-freebsd			freebsd-i386	freebsd-i386
-i386-kfreebsd-gnu		freebsd-i386	freebsd-i386
+i386-kfreebsd-gnu		kfreebsd-i386	kfreebsd-i386
 i386-netbsdelf-gnu		netbsd-i386	netbsd-i386
+i386-knetbsd-gnu		knetbsd-i386	knetbsd-i386
 s390-linux-gnu			s390		s390
 s390-ibm-linux-gnu		s390		s390
 s390-unknown-linux-gnu		s390		s390
@@ -62,6 +63,6 @@ i386-darwin			darwin-i386	darwin-i386
 s390x-linux-gnu			s390x		s390x
 s390x-ibm-linux-gnu		s390x		s390x
 s390x-unknown-linux-gnu		s390x		s390x
-x86_64-unknown-linux-gnu	amd64		amd64
-x86_64-linux			amd64		amd64
-x86_64-linux-gnu		amd64		amd64
+x86_64-unknown-linux-gnu	x86-64		x86_64
+x86_64-linux			x86-64		x86_64
+x86_64-linux-gnu		x86-64		x86_64

configure.in

@@ -105,6 +105,8 @@ case $target_os in
           os_type="linux-gnu";;
         *openbsd* )
           os_type="openbsd";;
+        *knetbsd*-gnu* )
+          os_type="knetbsd-gnu";;
         *netbsd* )
           os_type="netbsd";;
         *kfreebsd*-gnu* )

debian/changelog

@@ -1,61 +1,90 @@
 dpkg (1.10.22) unstable; urgency=low
 
-  * Add amd64 support. Closes: #238483, #241938.
-  * Add i?86-gnu support.  Closes: #216695, #236331.
-  * Fix dpkg-source (actually controllib.pl) to output the field name
-    properly again.  Closes: #246595.
-  * Make dpkg-scanpackages output Origin and Bugs fields with proper
-    casing.  Closes: #154422.
+  The DebConf4 Release.
+
+  This release is mostly intended to mop up the minor and trivial bug
+  fixes in the list and clear out the documentation changes.  As such,
+  it should be treated with even more suspicion than is normal.
+
+  * Use colouring to break cycles earlier to avoid long loops whilst
+    installing or configuring packages.  Closes: #232445, #246857.
+  * Don't try to configure packages that disappeared in the same
+    run.  Closes: #202997.
   * Fix segfault when "gcc -dumpmachine" returns a non-matching triplet.
     Closes: #211850.
-  * Add support for DOS line-endings to md5sum.  Closes: #246103.
   * Remove restriction that package names be at least two characters long.
     Closes: #237734.
-  * Create $(docdir) even when --without-sgml-doc is passed so the
-    ChangeLog can be installed.  Closes: #137719.
-  * Correct 'n' and 'p' key descriptions in dselect help message.
-    Closes: #120562.
-  * Stop hardcoding the list of manual page languages in debian/rules,
-    so we include Spanish, Russian and Brazilian Portugese.  Closes: #245994.
-  * Correct dpkg manpage to refer to --force-remove-reinstreq instead of
-    non-existant --force-reinstreq option.  Closes: #232831.
-  * Correct usage of "et al" to "et al.".  Closes: #230751.
-  * Correct documentation of --compare-versions arguments.  Closes: #232317.
-  * Correct documentation of start-stop-daemon manpage to refer to --retry
-    alongside --stop.  Closes: #204691.
-  * Correct documentation of dpkg-query --list.  Closes: #232639.
-  * Correct invalid use of " within update-alternatives(8) with .BR.
-    Closes: #244624.
-  * Correct documentation of start-stop-daemon.  Closes: #41554, #211856.
-  * Correct documentation of dpkg-statoverride --update.  Closes: #85079.
-  * Correct documentation of update-alternatives --install.  Closes: #179648.
-  * Correct various typos.  Closes: #219623, #221235.
-  * Correct hyphen characters in manpages.  Closes: #212284, #247086, #226800.
-  * Add dpkg-reconfigure(8) to SEE ALSO section of dpkg(8).  Closes: #233282.
-  * Add --force-bad-verify to dpkg manpage.  Closes: #192812.
-  * Add note that start-stop-daemon will chdir("/") unless -d is specified.
-    Closes: #217823, #218060.
-  * Suggest aptitude as well as dselect.  Closes: #217042.
-  * Suggest fakeroot for dpkg-source -r.  Closes: #175897.
-  * Suggest dselect update in description of dpkg --update-avail.
-    Closes: #206163.
-  * Suggest packages that provide additional functionality in the dpkg
-    manpage.  Closes: #81355.
-  * Remove obsolete references to the Debian Packaging Manual.
-    Closes: #122910, #140695.
-  * Replace "&c." with the slightly clearer "etc.".  Closes: #235773.
-  * Rewrite description of dpkg-source -i to indicate the intent of the
-    default setting rather than the exact exclusions.  Closes: #227169.
+  * Fix dpkg-source (actually controllib.pl) to output the field name
+    properly again.  Closes: #226931, #246595.
+  * Make dpkg-scanpackages output Origin and Bugs fields with proper
+    casing.  Closes: #154422.
+  * Add support for DOS line-endings to md5sum.  Closes: #246103.
+  * Fix start-stop-daemon segfault on Hurd.  Closes: #133640.
+  * Allow dpkg-shlibdeps to run as non-root users.  Closes: #96881.
+  * Correct various compiler warnings.  Closes: #229766.
+
+  * Architecture Support:
+    - Added x86-64 (x86_64 / amd64).  Closes: #238483, #241938.
+    - Added i?86-gnu (Hurd).  Closes: #216695, #236331.
+    - Added i386-kfreebsd-gnu and i386-knetbsd-gnu.  Closes: #250176.
+  * Packaging:
+    - Create $(docdir) even when --without-sgml-doc is passed so the
+      ChangeLog can be installed.  Closes: #137719.
+    - Stop hardcoding the list of manual page languages in debian/rules,
+      so we include Spanish, Russian and Brazilian Portugese.  Closes: #245994.
+    - Quote LDFLAGS in debian/rules to allow multiple options.
+      Closes: #230242.
+  * Documentation:
+    - Move dpkg-scanpackages and dpkg-scansources to section 1 as they
+      are user tools.  Closes: #114946.
+    - Correct hyphen characters in manpages.  Closes: #212284, #247086, #226800.
+    - Remove obsolete references to the Debian Packaging Manual.
+      Closes: #122910, #140695.
+    - Correct 'n' and 'p' key descriptions in dselect help message.
+      Closes: #120562.
+    - Add --force-bad-verify to dpkg manpage.  Closes: #192812.
+    - Correct dpkg manpage to refer to --force-remove-reinstreq instead of
+      -non-existant --force-reinstreq option.  Closes: #232831.
+    - Correct documentation of --compare-versions arguments.  Closes: #232317.
+    - Correct usage of "et al" to "et al.".  Closes: #230751.
+    - Add dpkg-reconfigure(8) to SEE ALSO section of dpkg(8).  Closes: #233282.
+    - Suggest packages that provide additional functionality in the dpkg
+      manpage.  Closes: #81355.
+    - Suggest dselect update in description of dpkg --update-avail.
+      Closes: #206163.
+    - Suggest aptitude as well as dselect.  Closes: #217042.
+    - Suggest fakeroot for dpkg-source -r.  Closes: #175897.
+    - Correct documentation of start-stop-daemon.  Closes: #41554, #211856.
+    - Correct documentation of start-stop-daemon manpage to refer to --retry
+      alongside --stop.  Closes: #204691.
+    - Add note that start-stop-daemon will chdir("/") unless -d is specified.
+      Closes: #217823, #218060.
+    - Correct documentation of dpkg-query --list.  Closes: #232639.
+    - Correct invalid use of " within update-alternatives(8) with .BR.
+      Closes: #244624.
+    - Rewrite description of dpkg-source -i to indicate the intent of the
+      default setting rather than the exact exclusions.  Closes: #227169.
+    - Correct documentation of dpkg-statoverride --update.  Closes: #85079.
+    - Correct documentation of update-alternatives --install.  Closes: #179648.
+    - Documented dpkg:Version and dpkg:UpstreamVersion substvars.
+      Closes: #85815, #85818.
+    - Fix spelling error in utils/md5sum.1.  Closes: #250281.
+    - Replace "&c." with the slightly clearer "etc.".  Closes: #235773.
+    - Correct various typos.  Closes: #219623, #221235.
   * Updated Translations:
     - Catalan (Jordi Mallach).
     - French (Christian Perrier).  Closes: #246359.
+    - Italian (Lele Gaifax).
+    - Japanese manpages (KISE Hiroshi).  Closes: #248483.
+    - Russian (Nikolai Prokoschenko).  Closes: #249254.
     - Spanish manpages (Ruben Porras).  Closes: #246158, #246159, #246160,
-      #246161, #246162, #246163.
+      #246161, #246162, #246163, #251830.
   * New Translations:
-    - German update-alternatives manpage (Helge Kreutzmann).  Closes: #247116.
+    - German start-stop-daemon and update-alternatives manpages
+      (Helge Kreutzmann).  Closes: #247116, #249454.
     - Spanish dpkg-scansources manpage (Ruben Porras).  Closes: #246164.
 
- -- Scott James Remnant <scott@netsplit.com>  UNRELEASED
+ -- Scott James Remnant <scott@netsplit.com>  Tue,  1 Jun 2004 18:21:40 -0300
 
 dpkg (1.10.21) unstable; urgency=low
 

debian/rules

@@ -50,7 +50,7 @@ config.guess config.sub: %: /usr/share/misc/%
 $(BUILD)/configure-stamp: configure config.h.in config.guess config.sub
 	$(checkdir)
 	install -d $(@D)
-	cd $(@D) && LDFLAGS=$(LDFLAGS) $(shell echo "$(patsubst $(CURDIR)/%,%,$(@D))" | sed -e 's,^[^/][^/]*$$,..,;s,/[^/][^/]*,/..,g' )/configure \
+	cd $(@D) && LDFLAGS="$(LDFLAGS)" $(shell echo "$(patsubst $(CURDIR)/%,%,$(@D))" | sed -e 's,^[^/][^/]*$$,..,;s,/[^/][^/]*,/..,g' )/configure \
 		--prefix=/usr \
 		--datadir=/usr/share \
 		--mandir=/usr/share/man \
@@ -209,7 +209,7 @@ binary-dpkg-dev: stamp-binary
 		for m in dpkg-name.1 dpkg-source.1 822-date.1 dpkg-architecture.1 \
 			dpkg-buildpackage.1 dpkg-distaddfile.1 dpkg-genchanges.1 \
 			dpkg-gencontrol.1 dpkg-parsechangelog.1 dpkg-shlibdeps.1 \
-			dpkg-checkbuilddeps.1 ; do \
+			dpkg-checkbuilddeps.1 dpkg-scanpackages.1 dpkg-scansources.1; do \
 			if [ -e $(INSTALL_TMP)/usr/share/man/$$i/man1/$$m ] ; then \
 				mv $(INSTALL_TMP)/usr/share/man/$$i/man1/$$m $(TMP_DPKG_DEV)/usr/share/man/$$i/man1/$$m ; \
 			fi ; \
@@ -220,12 +220,6 @@ binary-dpkg-dev: stamp-binary
 				mv $(INSTALL_TMP)/usr/share/man/$$i/man5/$$m $(TMP_DPKG_DEV)/usr/share/man/$$i/man5/$$m ; \
 			fi ; \
 		done ; \
-		install -d -m 755 -o root -g root $(TMP_DPKG_DEV)/usr/share/man/$$i/man8 ; \
-		for m in dpkg-scanpackages.8 dpkg-scansources.8 ; do \
-			if [ -e $(INSTALL_TMP)/usr/share/man/$$i/man8/$$m ] ; then \
-				mv $(INSTALL_TMP)/usr/share/man/$$i/man8/$$m $(TMP_DPKG_DEV)/usr/share/man/$$i/man8/$$m ; \
-			fi ; \
-		done ; \
 	done
 # Now that dpkg-dev has been installed, Debianize it
 # Policy stuff

dpkg-deb/extract.c

@@ -191,7 +191,7 @@ void extracthalf(const char *debar, const char *directory,
 
     if (admininfo >= 2)
       if (printf(_(" old debian package, version %s.\n"
-                 " size %ld bytes: control archive= %ld, main archive= %zi.\n"),
+                 " size %ld bytes: control archive= %zi, main archive= %ld.\n"),
                  versionbuf, (long)stab.st_size, ctrllennum,
                  (long) (stab.st_size - ctrllennum - strlen(ctrllenbuf) - l)) == EOF ||
           fflush(stdout)) werr("stdout");

dselect/dselect.8

@@ -142,7 +142,7 @@ repository, configured for the current access method, and update
 the dpkg database.  The package lists are commonly provided by the 
 repository as files named \fBPackages\fP or \fBPackages.gz\fP.  
 These files can be generated by repository maintainers, using the
-program \fBdpkg-scanpackages(8)\fP.  
+program \fBdpkg-scanpackages(1)\fP.  
 .sp
 Details of the update action depend on the access method's implementation.
 Normally the process is straightforward and requires no user interaction.

include/dpkg-db.h

@@ -139,6 +139,7 @@ struct pkginfo { /* pig */
   struct pkginfoperfile installed;
   struct pkginfoperfile available;
   struct perpackagestate *clientdata;
+  enum { white, gray, black } color;  /* used during cycle detection */
 };
 
 /*** from lock.c ***/

lib/database.c

@@ -71,6 +71,7 @@ void blankpackage(struct pkginfo *pigp) {
   pigp->installed.valid= 0;
   pigp->available.valid= 0;
   pigp->clientdata= NULL;
+  pigp->color= white;
   blankpackageperfile(&pigp->installed);
   blankpackageperfile(&pigp->available);
 }

main/configure.c

@@ -93,7 +93,7 @@ void deferred_configure(struct pkginfo *pkg) {
 				pkg->name, statusinfos[pkg->status].name);
 
 	if (dependtry > 1)
-		if (findbreakcycle(pkg,0))
+		if (findbreakcycle(pkg))
 			sincenothing= 0; 
 
 	varbufinit(&aemsgs);

main/depcon.c

@@ -37,6 +37,8 @@ struct cyclesofarlink {
   struct deppossi *possi;
 };
 
+static int findbreakcyclerecursive(struct pkginfo *pkg, struct cyclesofarlink *sofar);
+
 static int foundcyclebroken(struct cyclesofarlink *thislink,
                             struct cyclesofarlink *sofar,
                             struct pkginfo *dependedon,
@@ -54,7 +56,7 @@ static int foundcyclebroken(struct cyclesofarlink *thislink,
   for (sol=sofar; sol && sol->pkg != dependedon; sol=sol->back);
 
   /* If not, we do a recursive search on it to see what we find. */
-  if (!sol) return findbreakcycle(possi->ed,thislink);
+  if (!sol) return findbreakcyclerecursive(possi->ed,thislink);
   
   debug(dbg_depcon,"found cycle");
   /* Right, we now break one of the links.  We prefer to break
@@ -83,7 +85,7 @@ static int foundcyclebroken(struct cyclesofarlink *thislink,
   return 1;
 }
 
-int findbreakcycle(struct pkginfo *pkg, struct cyclesofarlink *sofar) {
+static int findbreakcyclerecursive(struct pkginfo *pkg, struct cyclesofarlink *sofar) {
   /* Cycle breaking works recursively down the package dependency
    * tree.  `sofar' is the list of packages we've descended down
    * already - if we encounter any of its packages again in a
@@ -94,8 +96,12 @@ int findbreakcycle(struct pkginfo *pkg, struct cyclesofarlink *sofar) {
   struct deppossi *possi, *providelink;
   struct pkginfo *provider;
 
+  if (pkg->color == black)
+    return 0;
+  pkg->color = gray;
+  
   if (f_debug & dbg_depcondetail) {
-    fprintf(stderr,"D0%05o: findbreakcycle %s ",dbg_depcondetail,pkg->name);
+    fprintf(stderr,"D0%05o: findbreakcyclerecursive %s ",dbg_depcondetail,pkg->name);
     for (sol=sofar; sol; sol=sol->back) fprintf(stderr," <- %s",sol->pkg->name);
     fprintf(stderr,"\n");
   }
@@ -125,9 +131,22 @@ int findbreakcycle(struct pkginfo *pkg, struct cyclesofarlink *sofar) {
     }
   }
   /* Nope, we didn't find a cycle to break. */
+  pkg->color = black;
   return 0;
 }
 
+int findbreakcycle(struct pkginfo *pkg) {
+  struct pkgiterator *iter;
+  struct pkginfo *tpkg;
+	
+  /* Clear the visited flag of all packages before we traverse them. */
+  for (iter = iterpkgstart(); (tpkg=iterpkgnext(iter)); ) {
+    tpkg->color = white;
+  }
+
+  return findbreakcyclerecursive(pkg, 0);
+}
+
 void describedepcon(struct varbuf *addto, struct dependency *dep) {
   varbufaddstr(addto,dep->up->name);
   switch (dep->type) {

main/main.h

@@ -217,7 +217,7 @@ void check_libver(void);
 int depisok(struct dependency *dep, struct varbuf *whynot,
             struct pkginfo **fixbyrm, int allowunconfigd);
 struct cyclesofarlink;
-int findbreakcycle(struct pkginfo *pkg, struct cyclesofarlink *sofar);
+int findbreakcycle(struct pkginfo *pkg);
 void describedepcon(struct varbuf *addto, struct dependency *dep);
 
 #endif /* MAIN_H */

main/packages.c

@@ -191,8 +191,11 @@ void process_queue(void) {
       assert(dependtry <= 4);
     }
     switch (cipaction->arg) {
-    case act_configure:
     case act_install:
+      /* Don't try to configure pkgs that we've just disappeared. */
+      if (pkg->status == stat_notinstalled)
+        break;
+    case act_configure:
       deferred_configure(pkg);
       break;
     case act_remove: case act_purge:

main/remove.c

@@ -71,7 +71,7 @@ static void checkforremoval(struct pkginfo *pkgtoremove,
       debug(dbg_depcon,"ignoring depending package `%s'\n",depender->name);
       continue;
     }
-    if (dependtry > 1) { if (findbreakcycle(pkgtoremove,0)) sincenothing= 0; }
+    if (dependtry > 1) { if (findbreakcycle(pkgtoremove)) sincenothing= 0; }
     before= raemsgs->used;
     ok= dependencies_ok(depender,pkgtoremove,raemsgs);
     if (ok == 0 && depender->clientdata->istobe == itb_remove) ok= 1;

man/de/Makefile.in

@@ -10,7 +10,7 @@ deman5dir	= $(subst $(mandir),$(mandir)/de,$(man5dir))
 deman8dir	= $(subst $(mandir),$(mandir)/de,$(man8dir))
 
 MAN1PAGES	= md5sum.1 
-MAN8PAGES	= update-alternatives.8
+MAN8PAGES	= start-stop-daemon.8 update-alternatives.8
 
 all: 
 

man/es/Makefile.in

@@ -10,12 +10,12 @@ esman5dir	= $(subst $(mandir),$(mandir)/es,$(man5dir))
 esman8dir	= $(subst $(mandir),$(mandir)/es,$(man8dir))
 
 MAN1PAGES	= dpkg-deb.1 dpkg-name.1 md5sum.1 dpkg-checkbuilddeps.1 \
-		  822-date.1 dpkg-source.1
+		  822-date.1 dpkg-source.1 dpkg-scanpackages.1 \
+		  dpkg-scansources.1
 MAN5PAGES	= deb-control.5 deb.5
-MAN8PAGES	= cleanup-info.8 dpkg.8 dpkg-divert.8 dpkg-scanpackages.8 \
-			start-stop-daemon.8 dselect.8 \
-			update-alternatives.8 dpkg-statoverride.8 dpkg-split.8 \
-			dpkg-scansources.8
+MAN8PAGES	= cleanup-info.8 dpkg.8 dpkg-divert.8 start-stop-daemon.8 \
+		  dselect.8 update-alternatives.8 dpkg-statoverride.8 \
+		  dpkg-split.8
 
 all: 
 

man/es/dpkg-divert.8

@@ -1,5 +1,5 @@
 .\" Esta traducción ha sido realizada Rudy Godoy 
-.\" Basado en la versión 1.1 del CVS de
+.\" Basado en la versión 1.2 del CVS de
 .\" /cvs/debian-doc/manpages/english/dpkg/dpkg-divert.8
 
 .TH DPKG-DIVERT 8 "Diciembre de 1999" "Proyecto Debian" "herramientas dpkg"
@@ -71,8 +71,15 @@ Imprime el nombre del programa y su versi
 Cuando se añade, por omisión se usa --local y --divert <original>.distrib.
 Cuando se elimina, --package o --local y --divert deben coincidir si se
 especifican.
-.br
+
 Los directorios no pueden ser redirigidos con dpkg-divert.
+
+Debe de tenerse cuidado cuando se redireccionen bibliotecas compartidas,
+ldconfig (8) crea un enlace simbólico basado en el campo DT_SONAME empotrado en
+la biblioteca. Ya que ldconfig no hace caso de las redirecciones (sólo dpkg lo
+hace), si una biblioteca redirigida tiene el mismo SONAME que la que no está
+redirigida, es posible que el enlace simbólico acabe apuntando a la biblioteca
+redirigida.
 .SH ARCHIVOS
 .TP
 .I /var/lib/dpkg/diversions

man/fr/Makefile.in

@@ -9,12 +9,12 @@ frman1dir	= $(subst $(mandir),$(mandir)/fr,$(man1dir))
 frman5dir	= $(subst $(mandir),$(mandir)/fr,$(man5dir))
 frman8dir	= $(subst $(mandir),$(mandir)/fr,$(man8dir))
 
-MAN1PAGES	= dpkg-deb.1 dpkg-name.1 dpkg-source.1
+MAN1PAGES	= dpkg-deb.1 dpkg-name.1 dpkg-source.1 dpkg-scanpackages.1 \
+		  dpkg-scansources.1
 MAN5PAGES	= deb-control.5 deb.5
-MAN8PAGES	= cleanup-info.8 dpkg.8 dpkg-divert.8 dpkg-scanpackages.8 \
-			dpkg-scansources.8 install-info.8 start-stop-daemon.8 \
-			update-alternatives.8 dpkg-statoverride.8 dpkg-split.8 \
-			dpkg-query.8
+MAN8PAGES	= cleanup-info.8 dpkg.8 dpkg-divert.8 install-info.8 \
+		  start-stop-daemon.8 update-alternatives.8 \
+		  dpkg-statoverride.8 dpkg-split.8 dpkg-query.8
 
 all: 
 

man/ja/Makefile.in

@@ -10,11 +10,12 @@ jaman5dir	= $(subst $(mandir),$(mandir)/ja,$(man5dir))
 jaman8dir	= $(subst $(mandir),$(mandir)/ja,$(man8dir))
 
 MAN1PAGES	= dpkg-deb.1 md5sum.1 822-date.1 dpkg-name.1 \
-		  dpkg-checkbuilddeps.1 dpkg-architecture.1 dpkg-source.1
+		  dpkg-checkbuilddeps.1 dpkg-architecture.1 dpkg-source.1 \
+		  dpkg-scanpackages.1 dpkg-scansources.1
 MAN5PAGES	= deb-old.5 deb.5 deb-control.5
 MAN8PAGES	= dpkg.8 dselect.8 install-info.8 start-stop-daemon.8 \
 		  update-alternatives.8 cleanup-info.8 dpkg-divert.8 \
-		  dpkg-scanpackages.8 dpkg-scansources.8 dpkg-query.8
+		  dpkg-query.8
 
 all: 
 

man/ja/dpkg-checkbuilddeps.1

@@ -1,4 +1,4 @@
-.\" Original manpage cvs revision: 1.3
+.\" Original manpage cvs revision: 1.3.2.1
 .TH DPKG-CHECKBUILDDEPS 1 "February 2001" "Debian project" "dpkg utililties"
 .SH 名前
 dpkg-checkbuilddeps -- ビルド依存と衝突のチェック
@@ -8,7 +8,6 @@ dpkg-checkbuilddeps --
 このプログラムはコントロールファイル中にリストされているビルド依存と
 ビルド衝突に関して、システムにインストールされているパッケージを
 チェックする。
-チェックされるパッケージには、build-essential も含まれる。
 もし、足りないものや衝突している物があるなら、それらを表示して 0 以外の
 返り値を返して終了する。
 .P

man/ja/dpkg-divert.8

@@ -1,4 +1,4 @@
-.\" original cvs revision: 1.4
+.\" original cvs revision: 1.4.2.1
 .TH DPKG-DIVERT 8 "December 1999" "Debian Project" "dpkg utilities"
 .SH 名前
 dpkg-divert -- パッケージのファイルのオーバーライド
@@ -69,8 +69,15 @@ dpkg
 追加する時は、デフォルトは --local と --divert <original>.distrib である。
 削除する問は、--package もしくは --local と --divert は指定されていれば
 追加した時と一致していなければいけない。
-.br
+
 dpkg-divert ではディレクトリは退避できない。
+
+共有ライブラリを退避する場合、注意すべきである。ldconfig(8)は
+ライブラリに埋め込まれている DT_SONAME フィールドに基づいて、
+シンボリックリンクを作成する。ldconfig は退避させることができないため
+である(dpkg だけができる)。もし退避したライブラリと退避していない
+ライブラリが同じ SONAME であれば、最終的にシンボリックリンクは退避した
+ライブラリを指す。
 .SH ファイル
 .TP
 .I /var/lib/dpkg/diversions

man/ja/dselect.8

@@ -243,12 +243,12 @@ normal, standout, underline, reverse, blink, bright, dim, bold
 .\" the dpkg database.  The package lists are commonly provided by the 
 .\" repository as files named \fBPackages\fP or \fBPackages.gz\fP.  
 .\" These files can be generated by repository maintainers, using the
-.\" program \fBdpkg-scanpackages(8)\fP.  
+.\" program \fBdpkg-scanpackages(1)\fP.  
 利用可能パッケージのバージョンリストを、現在設定しているアクセス方式で、
 パッケージリポジトリから取得し、dpkg データベースを更新する。
 パッケージリストは、一般的には \fBPackages\fP, \fBPackages.gz\fP という名前で、
 リポジトリより提供されている。
-リポジトリ管理者は、\fBdpkg-scanpackages(8)\fPというプログラムを使用して、
+リポジトリ管理者は、\fBdpkg-scanpackages(1)\fPというプログラムを使用して、
 このファイルを生成することができる。
 .sp
 .\" Details of the update action depend on the access method's implementation.

man/pt_BR/dselect.8

@@ -149,7 +149,7 @@ pacotes, configurado para o m
 dados do dpkg. As listas de pacotes são normalmente providas  pelo
 repositório como arquivos nomeados como \fBPackages\fP ou
 \fBPackages.gz\fP. Esses arquivos podem ser gerados pelos mantenedores
-do repositório, usando o programa \fBdpkg-scanpackages(8)\fP.  
+do repositório, usando o programa \fBdpkg-scanpackages(1)\fP.  
 .sp
 Detalhes da ação de atualização dependem da implementação do método  de
 acesso. Normalmente o processo é direto e não requer interação com o

man/sv/.check.pl

@@ -19,7 +19,7 @@ my %source = (
 	'dpkg-statoverride.8'	=> 'scripts',
 	'dpkg-divert.8'			=> 'scripts',
 	'dpkg-architecture.1'	=> 'scripts',
-	'dpkg-scanpackages.8'	=> 'scripts',
+	'dpkg-scanpackages.1'	=> 'scripts',
 	'update-alternatives.8'	=> 'scripts',
 	'install-info.8'		=> 'scripts',
 	'dpkg-name.1'			=> 'scripts',

man/sv/dselect.8

@@ -153,7 +153,7 @@ dpkgs databas.
 Paketlistor finns normalt på paketsamlingarna i filer vid namn
 \fBPackages\fP eller \fBPackages.gz\fP.
 Dessa filer kan genereras av de som underhåller samlingarna genom
-att använda programmet \fBdpkg-scanpackages(8)\fP.
+att använda programmet \fBdpkg-scanpackages(1)\fP.
 .sp
 Vilka detaljer som ges om uppdateringen beror på hur åtkomstmetoden
 är implementerad.

po/ca.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dpkg 1.10.22\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-04-30 11:17+0200\n"
+"POT-Creation-Date: 2004-06-01 18:18-0300\n"
 "PO-Revision-Date: 2004-04-30 11:16+0200\n"
 "Last-Translator: Jordi Mallach <jordi@debian.org>\n"
 "Language-Team: Catalan <debian-l10n-catalan@lists.debian.org>\n"
@@ -57,17 +57,17 @@ msgstr "S'ha produït un error del sistema núm.%d"
 msgid "Signal no.%d"
 msgstr "Senyal núm.%d"
 
-#: lib/database.c:124
+#: lib/database.c:125
 #, c-format
 msgid "couldn't allocate memory for strdup in findpackage(%s)"
 msgstr "no s'ha pogut assignar memòria per a «strdup» en findpackage(%s)"
 
-#: lib/database.c:194
+#: lib/database.c:195
 #, c-format
 msgid "size %7d occurs %5d times\n"
 msgstr "mida %7d té lloc %5d vegades\n"
 
-#: lib/database.c:195
+#: lib/database.c:196
 msgid "failed write during hashreport"
 msgstr "escriptura fallida de l'informe de tipus «hash»"
 
@@ -765,41 +765,37 @@ msgstr "no pot ser una cadena buida"
 msgid "must start with an alphanumeric"
 msgstr "ha de començar amb un caràcter alfanumèric"
 
-#: lib/parsehelp.c:115
-msgid "must be at least two characters"
-msgstr "ha de tindre almenys dos caràcters"
-
-#: lib/parsehelp.c:124
+#: lib/parsehelp.c:123
 #, c-format
 msgid "character `%c' not allowed - only letters, digits and %s allowed"
 msgstr "el caràcter «%c» no està permés - només s'admeten lletres, dígits i %s"
 
-#: lib/parsehelp.c:179
+#: lib/parsehelp.c:178
 msgid "<none>"
 msgstr "<cap>"
 
-#: lib/parsehelp.c:194
+#: lib/parsehelp.c:193
 msgid "version string is empty"
 msgstr "la cadena de versió està buida"
 
-#: lib/parsehelp.c:205
+#: lib/parsehelp.c:204
 msgid "version string has embedded spaces"
 msgstr "la cadena de versió té espais"
 
-#: lib/parsehelp.c:210
+#: lib/parsehelp.c:209
 msgid "epoch in version is not number"
 msgstr "l'època en la versió no és un número"
 
-#: lib/parsehelp.c:211
+#: lib/parsehelp.c:210
 msgid "nothing after colon in version number"
 msgstr "no hi ha res darrere dels dos punts en el número de versió"
 
-#: lib/parsehelp.c:233
+#: lib/parsehelp.c:232
 #, c-format
 msgid "missing %s"
 msgstr "manca %s"
 
-#: lib/parsehelp.c:237
+#: lib/parsehelp.c:236
 #, c-format
 msgid "empty value for %s"
 msgstr "valor buit per a %s"
@@ -1507,86 +1503,86 @@ msgstr "error de lectura en l'entrada estàndard al preguntar sobre conffiles"
 msgid "EOF on stdin at conffile prompt"
 msgstr "EOF en l'entrada estàndard al preguntar sobre conffiles"
 
-#: main/depcon.c:74
+#: main/depcon.c:76
 #, c-format
 msgid "unable to check for existence of `%.250s'"
 msgstr "no es pot comprovar l'existència de «%.250s»"
 
-#: main/depcon.c:134 main/packages.c:386
+#: main/depcon.c:153 main/packages.c:389
 msgid " depends on "
 msgstr " depèn de "
 
-#: main/depcon.c:135
+#: main/depcon.c:154
 msgid " pre-depends on "
 msgstr " pre-depèn de "
 
-#: main/depcon.c:136
+#: main/depcon.c:155
 msgid " recommends "
 msgstr " recomana "
 
-#: main/depcon.c:137
+#: main/depcon.c:156
 msgid " conflicts with "
 msgstr " entra en conflicte amb "
 
-#: main/depcon.c:138
+#: main/depcon.c:157
 msgid " suggests "
 msgstr " suggereix "
 
-#: main/depcon.c:139
+#: main/depcon.c:158
 msgid " enhances "
 msgstr " millora a "
 
-#: main/depcon.c:215
+#: main/depcon.c:234
 #, c-format
 msgid "  %.250s is to be removed.\n"
 msgstr "  %.250s serà desinstal·lat.\n"
 
-#: main/depcon.c:218
+#: main/depcon.c:237
 #, c-format
 msgid "  %.250s is to be deconfigured.\n"
 msgstr "  %.250s serà desconfigurat.\n"
 
-#: main/depcon.c:222
+#: main/depcon.c:241
 #, c-format
 msgid "  %.250s is to be installed, but is version %.250s.\n"
 msgstr "   %.250s serà instal·lat, però té una versió %.250s.\n"
 
-#: main/depcon.c:230
+#: main/depcon.c:249
 #, c-format
 msgid "  %.250s is installed, but is version %.250s.\n"
 msgstr "  %.250s està instal·lat, però té una versió %.250s.\n"
 
-#: main/depcon.c:245
+#: main/depcon.c:264
 #, c-format
 msgid "  %.250s is unpacked, but has never been configured.\n"
 msgstr "  %.250s està desempaquetat, però no ha estat configurat.\n"
 
-#: main/depcon.c:249
+#: main/depcon.c:268
 #, c-format
 msgid "  %.250s is unpacked, but is version %.250s.\n"
 msgstr "  %.250s està desempaquetat, però té una versió %.250s.\n"
 
-#: main/depcon.c:255
+#: main/depcon.c:274
 #, c-format
 msgid "  %.250s latest configured version is %.250s.\n"
 msgstr "  l'última versió configurada de %.250s és la %.250s.\n"
 
-#: main/depcon.c:264
+#: main/depcon.c:283
 #, c-format
 msgid "  %.250s is %s.\n"
 msgstr "  %.250s és %s.\n"
 
-#: main/depcon.c:300
+#: main/depcon.c:319
 #, c-format
 msgid "  %.250s provides %.250s but is to be removed.\n"
 msgstr "  %.250s proveeix %.250s però serà desinstal·lat.\n"
 
-#: main/depcon.c:304
+#: main/depcon.c:323
 #, c-format
 msgid "  %.250s provides %.250s but is to be deconfigured.\n"
 msgstr "  %.250s proveeix %.250s però serà desconfigurat.\n"
 
-#: main/depcon.c:309
+#: main/depcon.c:328
 #, c-format
 msgid "  %.250s provides %.250s but is %s.\n"
 msgstr "  %.250s proveeix %.250s però és %s.\n"
@@ -1594,28 +1590,28 @@ msgstr "  %.250s proveeix %.250s però és %s.\n"
 #. If the package wasn't installed at all, and we haven't said
 #. * yet why this isn't satisfied, we should say so now.
 #.
-#: main/depcon.c:323
+#: main/depcon.c:342
 #, c-format
 msgid "  %.250s is not installed.\n"
 msgstr "  %.250s no està instal·lat.\n"
 
-#: main/depcon.c:354
+#: main/depcon.c:373
 #, c-format
 msgid "  %.250s (version %.250s) is to be installed.\n"
 msgstr "  %.250s (versió %.250s) serà instal·lat.\n"
 
-#: main/depcon.c:368
+#: main/depcon.c:387
 #, c-format
 msgid "  %.250s (version %.250s) is %s.\n"
 msgstr "  %.250s (versió %.250s) és %s.\n"
 
 #. conflicts and provides the same
-#: main/depcon.c:393
+#: main/depcon.c:412
 #, c-format
 msgid "  %.250s provides %.250s and is to be installed.\n"
 msgstr "  %.250s proveeix %.250s y serà instal·lat.\n"
 
-#: main/depcon.c:424
+#: main/depcon.c:443
 #, c-format
 msgid "  %.250s provides %.250s and is %s.\n"
 msgstr "  %.250s proveeix %.250s i és %s.\n"
@@ -2154,7 +2150,7 @@ msgid " --licence for copyright and license details.\n"
 msgstr " --licence pels detalls de copyright i llicència.\n"
 
 #: main/main.c:58
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "Usage: \n"
 "  dpkg -i|--install      <.deb file name> ... | -R|--recursive <dir> ...\n"
@@ -2216,11 +2212,11 @@ msgid ""
 "  --abort-after <n>              Abort after encountering <n> errors\n"
 "\n"
 "Comparison operators for --compare-versions are:\n"
-" lt le eq ne ge gt       (treat no version as earlier than any version);\n"
-" lt-nl le-nl ge-nl gt-nl (treat no version as later than any version);\n"
+" lt le eq ne ge gt       (treat empty version as earlier than any version);\n"
+" lt-nl le-nl ge-nl gt-nl (treat empty version as later than any version);\n"
 " < << <= = >= >> >       (only for compatibility with control file syntax).\n"
 "\n"
-"Use `dselect' 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"
@@ -2345,7 +2341,7 @@ msgstr ""
 "Les opcions marcades amb ([*]) produeixen una extensa eixida - canalitzeu-la "
 "a través de «less» o «more»!"
 
-#: main/main.c:185 main/query.c:506 dpkg-deb/main.c:157 split/main.c:144
+#: main/main.c:185 main/query.c:506 dpkg-deb/main.c:157 split/main.c:146
 #, c-format
 msgid "conflicting actions --%s and --%s"
 msgstr "accions en conflicte --%s i --%s"
@@ -2545,7 +2541,7 @@ msgid "unexpected eof before end of line %d"
 msgstr "eof inesperat abans de la fí de la línia %d"
 
 #: main/main.c:540 main/main.c:555 main/query.c:541 dpkg-deb/main.c:169
-#: split/main.c:157
+#: split/main.c:159
 msgid "need an action option"
 msgstr "es necessita una opció d'acció"
 
@@ -2581,43 +2577,43 @@ msgstr ""
 "S'ha desempaquetat més d'una còpia del paquet %s!\n"
 " Només es configurarà una vegada.\n"
 
-#: main/packages.c:264 main/packages.c:308 main/packages.c:321
+#: main/packages.c:267 main/packages.c:311 main/packages.c:324
 msgid "  Package "
 msgstr "  el paquet "
 
-#: main/packages.c:267 main/packages.c:311 main/packages.c:324
+#: main/packages.c:270 main/packages.c:314 main/packages.c:327
 msgid " which provides "
 msgstr " que proveeix "
 
-#: main/packages.c:270
+#: main/packages.c:273
 msgid " is to be removed.\n"
 msgstr " serà desinstal·lat.\n"
 
-#: main/packages.c:282
+#: main/packages.c:285
 msgid "  Version of "
 msgstr "  Versió de "
 
-#: main/packages.c:284
+#: main/packages.c:287
 msgid " on system is "
 msgstr " en el sistema és "
 
-#: main/packages.c:304
+#: main/packages.c:307
 #, c-format
 msgid "dpkg: also configuring `%s' (required by `%s')\n"
 msgstr "dpkg: també configura «%s» (requerit per «%s»)\n"
 
-#: main/packages.c:314
+#: main/packages.c:317
 msgid " is not configured yet.\n"
 msgstr " encara no està configurat.\n"
 
-#: main/packages.c:327
+#: main/packages.c:330
 msgid " is not installed.\n"
 msgstr " no està instal·lat.\n"
 
 #. Don't print the line about the package to be removed if
 #. * that's the only line.
 #.
-#: main/packages.c:392
+#: main/packages.c:395
 msgid "; however:\n"
 msgstr "; tot i així:\n"
 
@@ -3597,10 +3593,10 @@ msgid "archive has malformatted ctrl len `%s'"
 msgstr "l'arxiu té una longitud de control mal formatada «%s»"
 
 #: dpkg-deb/extract.c:193
-#, c-format
+#, fuzzy, c-format
 msgid ""
 " old debian package, version %s.\n"
-" size %ld bytes: control archive= %ld, main archive= %zi.\n"
+" size %ld bytes: control archive= %zi, main archive= %ld.\n"
 msgstr ""
 " paquet debian antic, versió %s.\n"
 " mida %ld bytes: arxiu de control= %ld, arxiu principal= %zi.\n"
@@ -4017,7 +4013,7 @@ msgid "file `%.250s' is not an archive part"
 msgstr "el fitxer «%.250s» no és una part d'arxiu"
 
 #: split/info.c:188
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "%s:\n"
 "    Part format version:            %s\n"
@@ -4027,9 +4023,9 @@ msgid ""
 "        ... length:                 %lu bytes\n"
 "        ... split every:            %lu bytes\n"
 "    Part number:                    %d/%d\n"
-"    Part length:                    %lu bytes\n"
+"    Part length:                    %zi bytes\n"
 "    Part offset:                    %lu bytes\n"
-"    Part file size (used portion):  %zi bytes\n"
+"    Part file size (used portion):  %lu bytes\n"
 "\n"
 msgstr ""
 "%s:\n"
@@ -4089,11 +4085,11 @@ msgstr "--join requereix un o més fitxers part com a arguments"
 msgid "part %d is missing"
 msgstr "falta la part %d"
 
-#: split/main.c:38
+#: split/main.c:40
 msgid "Debian GNU/Linux `dpkg-split' package split/join tool; version "
 msgstr "utilitat de divisió/unió «dpkg-split» de Debian GNU/Linux; versió "
 
-#: split/main.c:40
+#: split/main.c:42
 msgid ""
 "Copyright (C) 1994-1996 Ian Jackson.  This is free software; see the\n"
 "GNU General Public Licence version 2 or later for copying conditions.\n"
@@ -4104,7 +4100,7 @@ msgstr ""
 "de còpia.  Aquest NO té cap garantia.  Mireu dpkg-split --licence per a més "
 "detalls.\n"
 
-#: split/main.c:47
+#: split/main.c:49
 #, c-format
 msgid ""
 "Usage: dpkg-split -s|--split <file> [<prefix>]     Split an archive.\n"
@@ -4150,30 +4146,30 @@ msgstr ""
 "\n"
 "Estat d'eixida: 0 = OK;  1 = -a no és una part;  2 = problemes!\n"
 
-#: split/main.c:68
+#: split/main.c:70
 msgid "Type dpkg-split --help for help."
 msgstr "Escriu dpkg-split --help per a obtindre ajuda."
 
-#: split/main.c:78
+#: split/main.c:80
 #, c-format
 msgid "error reading %s"
 msgstr "s'ha produït un error al llegir %s"
 
-#: split/main.c:82
+#: split/main.c:84
 #, c-format
 msgid "error reading %.250s"
 msgstr "s'ha produït un error al llegir %.250s"
 
-#: split/main.c:83
+#: split/main.c:85
 #, c-format
 msgid "unexpected end of file in %.250s"
 msgstr "s'ha trobat un fí de fitxer inesperat en %.250s"
 
-#: split/main.c:103
+#: split/main.c:105
 msgid "part size is far too large or is not positive"
 msgstr "la mida de la part és massa gran o no és positiva"
 
-#: split/main.c:107
+#: split/main.c:109
 #, c-format
 msgid "part size must be at least %dk (to allow for header)"
 msgstr ""
@@ -4348,37 +4344,37 @@ msgstr "fitxer_md"
 msgid "%s: unrecognized line\n"
 msgstr "%s: línia no reconeguda\n"
 
-#: utils/md5sum.c:284
+#: utils/md5sum.c:292
 #, c-format
 msgid "%s: can't open %s\n"
 msgstr "%s: no es pot obrir %s\n"
 
-#: utils/md5sum.c:288
+#: utils/md5sum.c:296
 #, c-format
 msgid "%s: error reading %s\n"
 msgstr "%s: s'ha produït un error en llegir %s\n"
 
-#: utils/md5sum.c:294
+#: utils/md5sum.c:302
 #, c-format
 msgid "FAILED\n"
 msgstr "HA FALLAT\n"
 
-#: utils/md5sum.c:296
+#: utils/md5sum.c:304
 #, c-format
 msgid "%s: MD5 check failed for '%s'\n"
 msgstr "%s: la comprovació MD5 ha fallat per a «%s»\n"
 
-#: utils/md5sum.c:299
+#: utils/md5sum.c:307
 #, c-format
 msgid "OK\n"
 msgstr "Correcte\n"
 
-#: utils/md5sum.c:303
+#: utils/md5sum.c:311
 #, c-format
 msgid "%s: %d of %d file(s) failed MD5 check\n"
 msgstr "%s: la comprovació MD5 ha fallat en %d de %d fitxers\n"
 
-#: utils/md5sum.c:305
+#: utils/md5sum.c:313
 #, c-format
 msgid "%s: no files checked\n"
 msgstr "%s: no s'ha comprovat cap fitxer\n"
@@ -5453,9 +5449,10 @@ msgid " verbose:v help:?"
 msgstr " depuració:v ajuda:?"
 
 #: dselect/pkginfo.cc:82
+#, fuzzy
 msgid ""
 "The line you have highlighted represents many packages; if you ask to "
-"install, remove, hold, &c it you will affect all the packages which match "
+"install, remove, hold, etc. it you will affect all the packages which match "
 "the criterion shown.\n"
 "\n"
 "If you move the highlight to a line for a particular package you will see "
@@ -5611,9 +5608,10 @@ msgid "Keystrokes"
 msgstr "Assignacions de tecles"
 
 #: dselect/helpmsgs.cc:8
+#, fuzzy
 msgid ""
 "Motion keys: Next/Previous, Top/End, Up/Down, Backwards/Forwards:\n"
-"  n, Down-arrow, j      p, Up-arrow, k          move highlight\n"
+"  Down-arrow, j         Up-arrow, k             move highlight\n"
 "  N, Page-down, Space   P, Page-up, Backspace   scroll list by 1 page\n"
 "  ^n                    ^p                      scroll list by 1 line\n"
 "  t, Home               e, End                  jump to top/end of list\n"
@@ -5639,7 +5637,7 @@ msgid ""
 "   R     Revert to state before this list      ^l   redraw display\n"
 "   U     set all to sUggested state             /   search (Return to "
 "cancel)\n"
-"   D     set all to Directly requested state    \\   repeat last search\n"
+"   D     set all to Directly requested state  n, \\  repeat last search\n"
 msgstr ""
 "Tecles de moviment: Re Pàg/Av Pàg, Inici/Fí, endavant/enrrere:\n"
 "  n, Avall, j          p, Amunt, k           mou el resaltat\n"
@@ -6064,6 +6062,9 @@ msgstr ""
 "  /             cerca (premeu Intro per a cancel·lar)\n"
 "  \\             repeteix l'última recerca\n"
 
+#~ msgid "must be at least two characters"
+#~ msgstr "ha de tindre almenys dos caràcters"
+
 #~ msgid "no gcc-lib component"
 #~ msgstr "no hi ha component gcc-lib"
 

po/cs.po

@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dpkg 1.9.4\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-04-25 18:54+0100\n"
+"POT-Creation-Date: 2004-06-01 18:18-0300\n"
 "PO-Revision-Date: 2001-05-02 13:37+02:00\n"
 "Last-Translator: Petr Cech <cech@debian.org>\n"
 "Language-Team: Czech <cs@li.org>\n"
@@ -59,7 +59,7 @@ msgstr "Syst
 msgid "Signal no.%d"
 msgstr "Signál èíslo %d"
 
-#: lib/database.c:124
+#: lib/database.c:125
 #, fuzzy, c-format
 msgid "couldn't allocate memory for strdup in findpackage(%s)"
 msgstr ""
@@ -67,12 +67,12 @@ msgstr ""
 "jejich¾\n"
 " instalace se nepodaøila."
 
-#: lib/database.c:194
+#: lib/database.c:195
 #, c-format
 msgid "size %7d occurs %5d times\n"
 msgstr "velikost %7d se objevuje %5d krát\n"
 
-#: lib/database.c:195
+#: lib/database.c:196
 msgid "failed write during hashreport"
 msgstr "chyba zápisu pøi hashreport"
 
@@ -741,42 +741,38 @@ msgstr "nesm
 msgid "must start with an alphanumeric"
 msgstr "musí zaèínat písmenem nebo èíslicí"
 
-#: lib/parsehelp.c:115
-msgid "must be at least two characters"
-msgstr "musí mít alespoò dva znaky"
-
-#: lib/parsehelp.c:124
+#: lib/parsehelp.c:123
 #, c-format
 msgid "character `%c' not allowed - only letters, digits and %s allowed"
 msgstr "znak `%c' není povolen - povolena jsou pouze písmena, èísla a %s"
 
-#: lib/parsehelp.c:179
+#: lib/parsehelp.c:178
 msgid "<none>"
 msgstr "<¾ádná>"
 
-#: lib/parsehelp.c:194
+#: lib/parsehelp.c:193
 msgid "version string is empty"
 msgstr "prázdná verze"
 
-#: lib/parsehelp.c:205
+#: lib/parsehelp.c:204
 #, fuzzy
 msgid "version string has embedded spaces"
 msgstr "prázdná verze"
 
-#: lib/parsehelp.c:210
+#: lib/parsehelp.c:209
 msgid "epoch in version is not number"
 msgstr "epocha ve verzi není èíslo"
 
-#: lib/parsehelp.c:211
+#: lib/parsehelp.c:210
 msgid "nothing after colon in version number"
 msgstr "za dvojteèkou ve verzi nic nenásleduje"
 
-#: lib/parsehelp.c:233
+#: lib/parsehelp.c:232
 #, c-format
 msgid "missing %s"
 msgstr "chybí %s"
 
-#: lib/parsehelp.c:237
+#: lib/parsehelp.c:236
 #, c-format
 msgid "empty value for %s"
 msgstr "polo¾ka `%s' je prázdná"
@@ -1461,86 +1457,86 @@ msgstr "chyba
 msgid "EOF on stdin at conffile prompt"
 msgstr "EOF na stdin pøi otázce na konfiguraèní soubor"
 
-#: main/depcon.c:74
+#: main/depcon.c:76
 #, c-format
 msgid "unable to check for existence of `%.250s'"
 msgstr "existenci `%.250s' nelze zkontrolovat"
 
-#: main/depcon.c:134 main/packages.c:386
+#: main/depcon.c:153 main/packages.c:389
 msgid " depends on "
 msgstr " závisí na "
 
-#: main/depcon.c:135
+#: main/depcon.c:154
 msgid " pre-depends on "
 msgstr " pøed-závisí na "
 
-#: main/depcon.c:136
+#: main/depcon.c:155
 msgid " recommends "
 msgstr " doporuèuje "
 
-#: main/depcon.c:137
+#: main/depcon.c:156
 msgid " conflicts with "
 msgstr " je v konfliktu s "
 
-#: main/depcon.c:138
+#: main/depcon.c:157
 msgid " suggests "
 msgstr "navrhuje "
 
-#: main/depcon.c:139
+#: main/depcon.c:158
 msgid " enhances "
 msgstr " roz¹iøuje "
 
-#: main/depcon.c:215
+#: main/depcon.c:234
 #, c-format
 msgid "  %.250s is to be removed.\n"
 msgstr "  %.250s bude odstraòen.\n"
 
-#: main/depcon.c:218
+#: main/depcon.c:237
 #, c-format
 msgid "  %.250s is to be deconfigured.\n"
 msgstr "  %.250s bude dekonfigurován.\n"
 
-#: main/depcon.c:222
+#: main/depcon.c:241
 #, c-format
 msgid "  %.250s is to be installed, but is version %.250s.\n"
 msgstr "  %.250s bude nainstalován, ale je verze %.250s.\n"
 
-#: main/depcon.c:230
+#: main/depcon.c:249
 #, c-format
 msgid "  %.250s is installed, but is version %.250s.\n"
 msgstr "  %.250s je nainstalován, ale je verze %.250s.\n"
 
-#: main/depcon.c:245
+#: main/depcon.c:264
 #, c-format
 msgid "  %.250s is unpacked, but has never been configured.\n"
 msgstr "  %.250s je rozbalen, ale je¹tì nebyl zkonfigurován.\n"
 
-#: main/depcon.c:249
+#: main/depcon.c:268
 #, c-format
 msgid "  %.250s is unpacked, but is version %.250s.\n"
 msgstr "  %.250s je rozbalen, ale je verze %.250s.\n"
 
-#: main/depcon.c:255
+#: main/depcon.c:274
 #, c-format
 msgid "  %.250s latest configured version is %.250s.\n"
 msgstr "  %.250s poslední zkonfigurovaná verze je %.250s.\n"
 
-#: main/depcon.c:264
+#: main/depcon.c:283
 #, c-format
 msgid "  %.250s is %s.\n"
 msgstr "  %.250s je %s.\n"
 
-#: main/depcon.c:300
+#: main/depcon.c:319
 #, c-format
 msgid "  %.250s provides %.250s but is to be removed.\n"
 msgstr "  %.250s poskytuje %.250s, ale bude odstranìn.\n"
 
-#: main/depcon.c:304
+#: main/depcon.c:323
 #, c-format
 msgid "  %.250s provides %.250s but is to be deconfigured.\n"
 msgstr "  %.250s poskytuje %.250s, ale bude dekonfigurován.\n"
 
-#: main/depcon.c:309
+#: main/depcon.c:328
 #, c-format
 msgid "  %.250s provides %.250s but is %s.\n"
 msgstr "  %.250s poskytuje %.250s, ale je %s.\n"
@@ -1548,28 +1544,28 @@ msgstr "  %.250s poskytuje %.250s, ale je %s.\n"
 #. If the package wasn't installed at all, and we haven't said
 #. * yet why this isn't satisfied, we should say so now.
 #.
-#: main/depcon.c:323
+#: main/depcon.c:342
 #, c-format
 msgid "  %.250s is not installed.\n"
 msgstr " %250s není nainstalován.\n"
 
-#: main/depcon.c:354
+#: main/depcon.c:373
 #, c-format
 msgid "  %.250s (version %.250s) is to be installed.\n"
 msgstr "  %.250s (verze %.250s) bude nainstalován.\n"
 
-#: main/depcon.c:368
+#: main/depcon.c:387
 #, c-format
 msgid "  %.250s (version %.250s) is %s.\n"
 msgstr "  %.250s (verze %.250s) je %s.\n"
 
 #. conflicts and provides the same
-#: main/depcon.c:393
+#: main/depcon.c:412
 #, c-format
 msgid "  %.250s provides %.250s and is to be installed.\n"
 msgstr "  %.250s poskytuje %.250s a bude nainstalován.\n"
 
-#: main/depcon.c:424
+#: main/depcon.c:443
 #, c-format
 msgid "  %.250s provides %.250s and is %s.\n"
 msgstr "  %.250s poskytuje %.250s a je %s.\n"
@@ -2153,11 +2149,11 @@ msgid ""
 "  --abort-after <n>              Abort after encountering <n> errors\n"
 "\n"
 "Comparison operators for --compare-versions are:\n"
-" lt le eq ne ge gt       (treat no version as earlier than any version);\n"
-" lt-nl le-nl ge-nl gt-nl (treat no version as later than any version);\n"
+" lt le eq ne ge gt       (treat empty version as earlier than any version);\n"
+" lt-nl le-nl ge-nl gt-nl (treat empty version as later than any version);\n"
 " < << <= = >= >> >       (only for compatibility with control file syntax).\n"
 "\n"
-"Use `dselect' for user-friendly package management.\n"
+"Use `dselect' or 'aptitude' for user-friendly package management.\n"
 msgstr ""
 "Pou¾ití: \n"
 "  dpkg -i|--install      <.deb souboru> ... | -R|--recursive <adr> ...\n"
@@ -2258,7 +2254,7 @@ msgstr ""
 "\n"
 "Volby oznaèené [*] produkují obsáhlý výstup - pou¾ijte `less' nebo `more' !"
 
-#: main/main.c:185 main/query.c:506 dpkg-deb/main.c:157 split/main.c:144
+#: main/main.c:185 main/query.c:506 dpkg-deb/main.c:157 split/main.c:146
 #, c-format
 msgid "conflicting actions --%s and --%s"
 msgstr "odporující si akce --%s a --%s"
@@ -2447,7 +2443,7 @@ msgid "unexpected eof before end of line %d"
 msgstr "neoèekávaný konec souboru pøed koncem øádku %d"
 
 #: main/main.c:540 main/main.c:555 main/query.c:541 dpkg-deb/main.c:169
-#: split/main.c:157
+#: split/main.c:159
 msgid "need an action option"
 msgstr "potøebuji zadat akci"
 
@@ -2484,43 +2480,43 @@ msgstr ""
 "Byla rozbalena více ne¾ jedna kopie balíku %s\n"
 " v tomto bìhu ! Konfiguruji jen jednou.\n"
 
-#: main/packages.c:264 main/packages.c:308 main/packages.c:321
+#: main/packages.c:267 main/packages.c:311 main/packages.c:324
 msgid "  Package "
 msgstr "  Balík "
 
-#: main/packages.c:267 main/packages.c:311 main/packages.c:324
+#: main/packages.c:270 main/packages.c:314 main/packages.c:327
 msgid " which provides "
 msgstr ", který poskytuje "
 
-#: main/packages.c:270
+#: main/packages.c:273
 msgid " is to be removed.\n"
 msgstr " bude odstranìn.\n"
 
-#: main/packages.c:282
+#: main/packages.c:285
 msgid "  Version of "
 msgstr "  verze balíku "
 
-#: main/packages.c:284
+#: main/packages.c:287
 msgid " on system is "
 msgstr " v systému je "
 
-#: main/packages.c:304
+#: main/packages.c:307
 #, c-format
 msgid "dpkg: also configuring `%s' (required by `%s')\n"
 msgstr "dpkg: také konfiguruji `%s' (vy¾adováno balíkem `%s')\n"
 
-#: main/packages.c:314
+#: main/packages.c:317
 msgid " is not configured yet.\n"
 msgstr " je¹tì není zkonfigurován.\n"
 
-#: main/packages.c:327
+#: main/packages.c:330
 msgid " is not installed.\n"
 msgstr " není nainstalován.\n"
 
 #. Don't print the line about the package to be removed if
 #. * that's the only line.
 #.
-#: main/packages.c:392
+#: main/packages.c:395
 msgid "; however:\n"
 msgstr "; av¹ak:\n"
 
@@ -3431,10 +3427,10 @@ msgid "archive has malformatted ctrl len `%s'"
 msgstr ""
 
 #: dpkg-deb/extract.c:193
-#, c-format
+#, fuzzy, c-format
 msgid ""
 " old debian package, version %s.\n"
-" size %ld bytes: control archive= %ld, main archive= %zi.\n"
+" size %ld bytes: control archive= %zi, main archive= %ld.\n"
 msgstr ""
 " starý formát balíku, verze %s.\n"
 " velikost %ld bajtù: øídící archiv= %ld, hlavní archiv= %zi.\n"
@@ -3823,7 +3819,7 @@ msgid "file `%.250s' is not an archive part"
 msgstr "soubor `%.250s' není èástí archivu"
 
 #: split/info.c:188
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "%s:\n"
 "    Part format version:            %s\n"
@@ -3833,9 +3829,9 @@ msgid ""
 "        ... length:                 %lu bytes\n"
 "        ... split every:            %lu bytes\n"
 "    Part number:                    %d/%d\n"
-"    Part length:                    %lu bytes\n"
+"    Part length:                    %zi bytes\n"
 "    Part offset:                    %lu bytes\n"
-"    Part file size (used portion):  %zi bytes\n"
+"    Part file size (used portion):  %lu bytes\n"
 "\n"
 msgstr ""
 "%s:\n"
@@ -3894,14 +3890,14 @@ msgstr "--join pot
 msgid "part %d is missing"
 msgstr "%d. èást chybí"
 
-#: split/main.c:38
+#: split/main.c:40
 msgid "Debian GNU/Linux `dpkg-split' package split/join tool; version "
 msgstr ""
 "Debian GNU/Linux `dpkg-split' - nástroj pro rozdìlování a sluèování "
 "souborù;\n"
 " verze "
 
-#: split/main.c:40
+#: split/main.c:42
 msgid ""
 "Copyright (C) 1994-1996 Ian Jackson.  This is free software; see the\n"
 "GNU General Public Licence version 2 or later for copying conditions.\n"
@@ -3913,7 +3909,7 @@ msgstr ""
 "programové vybavení je absolutnì bez záruky. Pou¾itím dpkg-split --licence\n"
 "získáte více informací.\n"
 
-#: split/main.c:47
+#: split/main.c:49
 #, c-format
 msgid ""
 "Usage: dpkg-split -s|--split <file> [<prefix>]     Split an archive.\n"
@@ -3959,30 +3955,30 @@ msgstr ""
 "\n"
 "Výstupní stavy: 0 = OK;  1 = -a a není èástí;  2 = problémy!\n"
 
-#: split/main.c:68
+#: split/main.c:70
 msgid "Type dpkg-split --help for help."
 msgstr "Napi¹te dpkg-split --help pro získání nápovìdy."
 
-#: split/main.c:78
+#: split/main.c:80
 #, c-format
 msgid "error reading %s"
 msgstr "chyba pøi ètení %s"
 
-#: split/main.c:82
+#: split/main.c:84
 #, c-format
 msgid "error reading %.250s"
 msgstr "chyba pøi ètení %.250s"
 
-#: split/main.c:83
+#: split/main.c:85
 #, c-format
 msgid "unexpected end of file in %.250s"
 msgstr "neoèekávaný konec souboru v %.250s"
 
-#: split/main.c:103
+#: split/main.c:105
 msgid "part size is far too large or is not positive"
 msgstr "velikost èásti je buï pøíli¹ veliká, nebo nekladná"
 
-#: split/main.c:107
+#: split/main.c:109
 #, c-format
 msgid "part size must be at least %dk (to allow for header)"
 msgstr "velikost èásti musí být alespoò %dk (kvùli hlavièce)"
@@ -4159,37 +4155,37 @@ msgstr "mdfile"
 msgid "%s: unrecognized line\n"
 msgstr "%s: nerozpoznaný øádek: %s"
 
-#: utils/md5sum.c:284
+#: utils/md5sum.c:292
 #, c-format
 msgid "%s: can't open %s\n"
 msgstr "%s: %s nelze otevøít\n"
 
-#: utils/md5sum.c:288
+#: utils/md5sum.c:296
 #, c-format
 msgid "%s: error reading %s\n"
 msgstr "%s: chyba pøi ètení %s\n"
 
-#: utils/md5sum.c:294
+#: utils/md5sum.c:302
 #, c-format
 msgid "FAILED\n"
 msgstr "CHYBNÝ\n"
 
-#: utils/md5sum.c:296
+#: utils/md5sum.c:304
 #, c-format
 msgid "%s: MD5 check failed for '%s'\n"
 msgstr "%s: MD5 test nevyhovìl soubor `%s'\n"
 
-#: utils/md5sum.c:299
+#: utils/md5sum.c:307
 #, c-format
 msgid "OK\n"
 msgstr "OK\n"
 
-#: utils/md5sum.c:303
+#: utils/md5sum.c:311
 #, c-format
 msgid "%s: %d of %d file(s) failed MD5 check\n"
 msgstr "%s: %d z %d souborù nevyhovìlo MD5 testu\n"
 
-#: utils/md5sum.c:305
+#: utils/md5sum.c:313
 #, c-format
 msgid "%s: no files checked\n"
 msgstr "%s: ¾ádné soubory zkontrolovány\n"
@@ -5261,9 +5257,10 @@ msgid " verbose:v help:?"
 msgstr " podrob:v pomoc:?"
 
 #: dselect/pkginfo.cc:82
+#, fuzzy
 msgid ""
 "The line you have highlighted represents many packages; if you ask to "
-"install, remove, hold, &c it you will affect all the packages which match "
+"install, remove, hold, etc. it you will affect all the packages which match "
 "the criterion shown.\n"
 "\n"
 "If you move the highlight to a line for a particular package you will see "
@@ -5419,9 +5416,10 @@ msgid "Keystrokes"
 msgstr "Funkce kláves"
 
 #: dselect/helpmsgs.cc:8
+#, fuzzy
 msgid ""
 "Motion keys: Next/Previous, Top/End, Up/Down, Backwards/Forwards:\n"
-"  n, Down-arrow, j      p, Up-arrow, k          move highlight\n"
+"  Down-arrow, j         Up-arrow, k             move highlight\n"
 "  N, Page-down, Space   P, Page-up, Backspace   scroll list by 1 page\n"
 "  ^n                    ^p                      scroll list by 1 line\n"
 "  t, Home               e, End                  jump to top/end of list\n"
@@ -5447,7 +5445,7 @@ msgid ""
 "   R     Revert to state before this list      ^l   redraw display\n"
 "   U     set all to sUggested state             /   search (Return to "
 "cancel)\n"
-"   D     set all to Directly requested state    \\   repeat last search\n"
+"   D     set all to Directly requested state  n, \\  repeat last search\n"
 msgstr ""
 "Posuny: Následující/Pøedchozí, Zaèátek/Konec, Nahoru/Dolù, Vzad/Vpøed:\n"
 "  n, ¹ipka dolù, j      p, ¹ipka nahoru, k      posun zvýraznìní\n"
@@ -5870,6 +5868,9 @@ msgstr ""
 "  /                hledá (zru¹ení stiskem Return)\n"
 "  \\                opakuje poslední hledání\n"
 
+#~ msgid "must be at least two characters"
+#~ msgstr "musí mít alespoò dva znaky"
+
 #~ msgid "no gcc-lib component"
 #~ msgstr "neobsahuje èást gcc-lib"
 

po/da.po

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dpkg_1.10.19_da\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-04-25 18:54+0100\n"
+"POT-Creation-Date: 2004-06-01 18:18-0300\n"
 "PO-Revision-Date: 2004-04-06 11:03+0200\n"
 "Last-Translator: Claus Hindsgaul <claus_h@image.dk>\n"
 "Language-Team: Danish <dansk@klid.dk>\n"
@@ -60,17 +60,17 @@ msgstr "Systemfejl nr. %d"
 msgid "Signal no.%d"
 msgstr "Signal nr. %d"
 
-#: lib/database.c:124
+#: lib/database.c:125
 #, c-format
 msgid "couldn't allocate memory for strdup in findpackage(%s)"
 msgstr "kunne ikke frigøre hukommelse til strdup i findpackage(%s)"
 
-#: lib/database.c:194
+#: lib/database.c:195
 #, c-format
 msgid "size %7d occurs %5d times\n"
 msgstr "størrelse %7d forekommer %5d gange\n"
 
-#: lib/database.c:195
+#: lib/database.c:196
 msgid "failed write during hashreport"
 msgstr "kunne ikke skrive under \"hashreport\""
 
@@ -754,41 +754,37 @@ msgstr "m
 msgid "must start with an alphanumeric"
 msgstr "skal starte med alfanumerisk tegn"
 
-#: lib/parsehelp.c:115
-msgid "must be at least two characters"
-msgstr "skal have mindst to tegn"
-
-#: lib/parsehelp.c:124
+#: lib/parsehelp.c:123
 #, c-format
 msgid "character `%c' not allowed - only letters, digits and %s allowed"
 msgstr "tegnet '%c' tillades ikke - kun bogstaver, cifre og %s tillades"
 
-#: lib/parsehelp.c:179
+#: lib/parsehelp.c:178
 msgid "<none>"
 msgstr "<ingen>"
 
-#: lib/parsehelp.c:194
+#: lib/parsehelp.c:193
 msgid "version string is empty"
 msgstr "versionsstreng er tom"
 
-#: lib/parsehelp.c:205
+#: lib/parsehelp.c:204
 msgid "version string has embedded spaces"
 msgstr "versionsstreng indeholder mellemrum"
 
-#: lib/parsehelp.c:210
+#: lib/parsehelp.c:209
 msgid "epoch in version is not number"
 msgstr "epoke i version er ikke et tal"
 
-#: lib/parsehelp.c:211
+#: lib/parsehelp.c:210
 msgid "nothing after colon in version number"
 msgstr "intet efter kolon i versionsnummer"
 
-#: lib/parsehelp.c:233
+#: lib/parsehelp.c:232
 #, c-format
 msgid "missing %s"
 msgstr "manglende %s"
 
-#: lib/parsehelp.c:237
+#: lib/parsehelp.c:236
 #, c-format
 msgid "empty value for %s"
 msgstr "tom værdi for %s"
@@ -1475,86 +1471,86 @@ msgstr "l
 msgid "EOF on stdin at conffile prompt"
 msgstr "Slut-på-fil ved standard-ind ved konfigurationsfil-prompt"
 
-#: main/depcon.c:74
+#: main/depcon.c:76
 #, c-format
 msgid "unable to check for existence of `%.250s'"
 msgstr "kunne ikke tjekke eksistensen af '%.250s'"
 
-#: main/depcon.c:134 main/packages.c:386
+#: main/depcon.c:153 main/packages.c:389
 msgid " depends on "
 msgstr " afhænger af "
 
-#: main/depcon.c:135
+#: main/depcon.c:154
 msgid " pre-depends on "
 msgstr " afhænger i forvejen af "
 
-#: main/depcon.c:136
+#: main/depcon.c:155
 msgid " recommends "
 msgstr " anbefaler "
 
-#: main/depcon.c:137
+#: main/depcon.c:156
 msgid " conflicts with "
 msgstr " er i konflikt med "
 
-#: main/depcon.c:138
+#: main/depcon.c:157
 msgid " suggests "
 msgstr " foreslår "
 
-#: main/depcon.c:139
+#: main/depcon.c:158
 msgid " enhances "
 msgstr " forbedrer "
 
-#: main/depcon.c:215
+#: main/depcon.c:234
 #, c-format
 msgid "  %.250s is to be removed.\n"
 msgstr "  %.250s vil blive fjernet.\n"
 
-#: main/depcon.c:218
+#: main/depcon.c:237
 #, c-format
 msgid "  %.250s is to be deconfigured.\n"
 msgstr "  %.250s vil blive dekonfigureret.\n"
 
-#: main/depcon.c:222
+#: main/depcon.c:241
 #, c-format
 msgid "  %.250s is to be installed, but is version %.250s.\n"
 msgstr "  %.250s vil blive installeret, men versionen er %.250s.\n"
 
-#: main/depcon.c:230
+#: main/depcon.c:249
 #, c-format
 msgid "  %.250s is installed, but is version %.250s.\n"
 msgstr "  %.250s er installeret, men versionen er %.250s.\n"
 
-#: main/depcon.c:245
+#: main/depcon.c:264
 #, c-format
 msgid "  %.250s is unpacked, but has never been configured.\n"
 msgstr "  %.250s er udpakket, men blev aldrig konfigureret.\n"
 
-#: main/depcon.c:249
+#: main/depcon.c:268
 #, c-format
 msgid "  %.250s is unpacked, but is version %.250s.\n"
 msgstr "  %.250s er udpakket, men versionen er %.250s.\n"
 
-#: main/depcon.c:255
+#: main/depcon.c:274
 #, c-format
 msgid "  %.250s latest configured version is %.250s.\n"
 msgstr "  %.250s sidst konfigurerede version er %.250s.\n"
 
-#: main/depcon.c:264
+#: main/depcon.c:283
 #, c-format
 msgid "  %.250s is %s.\n"
 msgstr "  %.250s er %s.\n"
 
-#: main/depcon.c:300
+#: main/depcon.c:319
 #, c-format
 msgid "  %.250s provides %.250s but is to be removed.\n"
 msgstr "  %.250s giver %.250s, men planlægges fjernet.\n"
 
-#: main/depcon.c:304
+#: main/depcon.c:323
 #, c-format
 msgid "  %.250s provides %.250s but is to be deconfigured.\n"
 msgstr "  %.250s giver %.250s, men planlægges dekonfigureret.\n"
 
-#: main/depcon.c:309
+#: main/depcon.c:328
 #, c-format
 msgid "  %.250s provides %.250s but is %s.\n"
 msgstr "  %.250s giver %.250s, men er %s.\n"
@@ -1562,28 +1558,28 @@ msgstr "  %.250s giver %.250s, men er %s.\n"
 #. If the package wasn't installed at all, and we haven't said
 #. * yet why this isn't satisfied, we should say so now.
 #.
-#: main/depcon.c:323
+#: main/depcon.c:342
 #, c-format
 msgid "  %.250s is not installed.\n"
 msgstr "  %.250s er ikke installeret.\n"
 
-#: main/depcon.c:354
+#: main/depcon.c:373
 #, c-format
 msgid "  %.250s (version %.250s) is to be installed.\n"
 msgstr "  %.250s (version %.250s) vil blive installeret.\n"
 
-#: main/depcon.c:368
+#: main/depcon.c:387
 #, c-format
 msgid "  %.250s (version %.250s) is %s.\n"
 msgstr "  %.250s (version %.250s) er %s.\n"
 
 #. conflicts and provides the same
-#: main/depcon.c:393
+#: main/depcon.c:412
 #, c-format
 msgid "  %.250s provides %.250s and is to be installed.\n"
 msgstr "  %.250s giver %.250s og vil blive installeret.\n"
 
-#: main/depcon.c:424
+#: main/depcon.c:443
 #, c-format
 msgid "  %.250s provides %.250s and is %s.\n"
 msgstr "  %.250s giver %.250s og er %s.\n"
@@ -2106,7 +2102,7 @@ msgid " --licence for copyright and license details.\n"
 msgstr "--licence for detaljer om ophavsret og licens.\n"
 
 #: main/main.c:58
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "Usage: \n"
 "  dpkg -i|--install      <.deb file name> ... | -R|--recursive <dir> ...\n"
@@ -2168,11 +2164,11 @@ msgid ""
 "  --abort-after <n>              Abort after encountering <n> errors\n"
 "\n"
 "Comparison operators for --compare-versions are:\n"
-" lt le eq ne ge gt       (treat no version as earlier than any version);\n"
-" lt-nl le-nl ge-nl gt-nl (treat no version as later than any version);\n"
+" lt le eq ne ge gt       (treat empty version as earlier than any version);\n"
+" lt-nl le-nl ge-nl gt-nl (treat empty version as later than any version);\n"
 " < << <= = >= >> >       (only for compatibility with control file syntax).\n"
 "\n"
-"Use `dselect' 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"
@@ -2278,7 +2274,7 @@ msgstr ""
 "Tilvalg markeret med [*] giver mange uddata - led dem gennem 'less' eller "
 "'more'!"
 
-#: main/main.c:185 main/query.c:506 dpkg-deb/main.c:157 split/main.c:144
+#: main/main.c:185 main/query.c:506 dpkg-deb/main.c:157 split/main.c:146
 #, c-format
 msgid "conflicting actions --%s and --%s"
 msgstr "modstridende handlinger --%s og --%s"
@@ -2467,7 +2463,7 @@ msgid "unexpected eof before end of line %d"
 msgstr "uventet slut-på-fil før afslutningen af linje %d"
 
 #: main/main.c:540 main/main.c:555 main/query.c:541 dpkg-deb/main.c:169
-#: split/main.c:157
+#: split/main.c:159
 msgid "need an action option"
 msgstr "kræver et handlings-tilvalg"
 
@@ -2502,43 +2498,43 @@ msgstr ""
 "Flere kopier af pakken %s er blevet udpakket under\n"
 " denne kørsel! Konfigurerer den kun én gang.\n"
 
-#: main/packages.c:264 main/packages.c:308 main/packages.c:321
+#: main/packages.c:267 main/packages.c:311 main/packages.c:324
 msgid "  Package "
 msgstr "  Pakken "
 
-#: main/packages.c:267 main/packages.c:311 main/packages.c:324
+#: main/packages.c:270 main/packages.c:314 main/packages.c:327
 msgid " which provides "
 msgstr " som giver "
 
-#: main/packages.c:270
+#: main/packages.c:273
 msgid " is to be removed.\n"
 msgstr " vil blive fjernet.\n"
 
-#: main/packages.c:282
+#: main/packages.c:285
 msgid "  Version of "
 msgstr "  Versionen af "
 
-#: main/packages.c:284
+#: main/packages.c:287
 msgid " on system is "
 msgstr " på systemet er "
 
-#: main/packages.c:304
+#: main/packages.c:307
 #, c-format
 msgid "dpkg: also configuring `%s' (required by `%s')\n"
 msgstr "dpkg: konfigurerer også '%s' (krævet af '%s')\n"
 
-#: main/packages.c:314
+#: main/packages.c:317
 msgid " is not configured yet.\n"
 msgstr " er ikke konfigureret endnu.\n"
 
-#: main/packages.c:327
+#: main/packages.c:330
 msgid " is not installed.\n"
 msgstr " er ikke installeret.\n"
 
 #. Don't print the line about the package to be removed if
 #. * that's the only line.
 #.
-#: main/packages.c:392
+#: main/packages.c:395
 msgid "; however:\n"
 msgstr ", men:\n"
 
@@ -3485,10 +3481,10 @@ msgid "archive has malformatted ctrl len `%s'"
 msgstr "arkivet har forkert udformet kontrollængde '%s'"
 
 #: dpkg-deb/extract.c:193
-#, c-format
+#, fuzzy, c-format
 msgid ""
 " old debian package, version %s.\n"
-" size %ld bytes: control archive= %ld, main archive= %zi.\n"
+" size %ld bytes: control archive= %zi, main archive= %ld.\n"
 msgstr ""
 " gammel debianpakke, version %s.\n"
 " størrelse %ld byte: kontrolarkiv= %ld, hovedarkiv= %zi.\n"
@@ -3884,7 +3880,7 @@ msgid "file `%.250s' is not an archive part"
 msgstr "filen '%.250s' er ikke en arkivdel"
 
 #: split/info.c:188
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "%s:\n"
 "    Part format version:            %s\n"
@@ -3894,9 +3890,9 @@ msgid ""
 "        ... length:                 %lu bytes\n"
 "        ... split every:            %lu bytes\n"
 "    Part number:                    %d/%d\n"
-"    Part length:                    %lu bytes\n"
+"    Part length:                    %zi bytes\n"
 "    Part offset:                    %lu bytes\n"
-"    Part file size (used portion):  %zi bytes\n"
+"    Part file size (used portion):  %lu bytes\n"
 "\n"
 msgstr ""
 "%s:\n"
@@ -3956,12 +3952,12 @@ msgstr "--join kr
 msgid "part %d is missing"
 msgstr "del %d mangler"
 
-#: split/main.c:38
+#: split/main.c:40
 msgid "Debian GNU/Linux `dpkg-split' package split/join tool; version "
 msgstr ""
 "Debian GNU/Linux 'dpkg-split' pakkeopdeling/sammenføjningsværktøj; version "
 
-#: split/main.c:40
+#: split/main.c:42
 msgid ""
 "Copyright (C) 1994-1996 Ian Jackson.  This is free software; see the\n"
 "GNU General Public Licence version 2 or later for copying conditions.\n"
@@ -3971,7 +3967,7 @@ msgstr ""
 "GNU General Public Licence version 2 eller senere for forhold vedrørende\n"
 "kopiering. Der er INGEN garanti.  Se 'dpkg-split --licence' for detaljerne.\n"
 
-#: split/main.c:47
+#: split/main.c:49
 #, c-format
 msgid ""
 "Usage: dpkg-split -s|--split <file> [<prefix>]     Split an archive.\n"
@@ -4017,30 +4013,30 @@ msgstr ""
 "\n"
 "Afslutningsstatus: 0 = o.k.;  1 = -a er ikke en del;  2 = problemer!\n"
 
-#: split/main.c:68
+#: split/main.c:70
 msgid "Type dpkg-split --help for help."
 msgstr "Skriv \"dpkg-split --help\" for hjælp."
 
-#: split/main.c:78
+#: split/main.c:80
 #, c-format
 msgid "error reading %s"
 msgstr "fejl ved læsning af %s"
 
-#: split/main.c:82
+#: split/main.c:84
 #, c-format
 msgid "error reading %.250s"
 msgstr "fejl ved læsning af %.250s"
 
-#: split/main.c:83
+#: split/main.c:85
 #, c-format
 msgid "unexpected end of file in %.250s"
 msgstr "uventet filafslutning i %.250s"
 
-#: split/main.c:103
+#: split/main.c:105
 msgid "part size is far too large or is not positive"
 msgstr "delen er alt for stor, eller størrelsen er ikke positiv"
 
-#: split/main.c:107
+#: split/main.c:109
 #, c-format
 msgid "part size must be at least %dk (to allow for header)"
 msgstr "delen skal mindst være på %dk (for at få plads til hoved)"
@@ -4214,37 +4210,37 @@ msgstr "mdfil"
 msgid "%s: unrecognized line\n"
 msgstr "%s: ikke genkendt linje\n"
 
-#: utils/md5sum.c:284
+#: utils/md5sum.c:292
 #, c-format
 msgid "%s: can't open %s\n"
 msgstr "%s: kan ikke åbne %s\n"
 
-#: utils/md5sum.c:288
+#: utils/md5sum.c:296
 #, c-format
 msgid "%s: error reading %s\n"
 msgstr "%s: fejl ved læsning af %s\n"
 
-#: utils/md5sum.c:294
+#: utils/md5sum.c:302
 #, c-format
 msgid "FAILED\n"
 msgstr "MISLYKKEDES\n"
 
-#: utils/md5sum.c:296
+#: utils/md5sum.c:304
 #, c-format
 msgid "%s: MD5 check failed for '%s'\n"
 msgstr "%s: MD5-check mislykkedes for '%s'\n"
 
-#: utils/md5sum.c:299
+#: utils/md5sum.c:307
 #, c-format
 msgid "OK\n"
 msgstr "O.k.\n"
 
-#: utils/md5sum.c:303
+#: utils/md5sum.c:311
 #, c-format
 msgid "%s: %d of %d file(s) failed MD5 check\n"
 msgstr "%s: %d ud af %d fil(er) dumpede i deres MD5-check\n"
 
-#: utils/md5sum.c:305
+#: utils/md5sum.c:313
 #, c-format
 msgid "%s: no files checked\n"
 msgstr "%s: ingen filer blev checket\n"
@@ -5313,9 +5309,10 @@ msgid " verbose:v help:?"
 msgstr " detaljer:v hjælp:?"
 
 #: dselect/pkginfo.cc:82
+#, fuzzy
 msgid ""
 "The line you have highlighted represents many packages; if you ask to "
-"install, remove, hold, &c it you will affect all the packages which match "
+"install, remove, hold, etc. it you will affect all the packages which match "
 "the criterion shown.\n"
 "\n"
 "If you move the highlight to a line for a particular package you will see "
@@ -5471,9 +5468,10 @@ msgid "Keystrokes"
 msgstr "Taster"
 
 #: dselect/helpmsgs.cc:8
+#, fuzzy
 msgid ""
 "Motion keys: Next/Previous, Top/End, Up/Down, Backwards/Forwards:\n"
-"  n, Down-arrow, j      p, Up-arrow, k          move highlight\n"
+"  Down-arrow, j         Up-arrow, k             move highlight\n"
 "  N, Page-down, Space   P, Page-up, Backspace   scroll list by 1 page\n"
 "  ^n                    ^p                      scroll list by 1 line\n"
 "  t, Home               e, End                  jump to top/end of list\n"
@@ -5499,7 +5497,7 @@ msgid ""
 "   R     Revert to state before this list      ^l   redraw display\n"
 "   U     set all to sUggested state             /   search (Return to "
 "cancel)\n"
-"   D     set all to Directly requested state    \\   repeat last search\n"
+"   D     set all to Directly requested state  n, \\  repeat last search\n"
 msgstr ""
 "Bevægelsestaster: Næste/Tidligere, Top/Bund, Op/Ned, Baglæns/Forlæns:\n"
 "  n, Pil-ned            p, Pil-op               Flyt markering\n"
@@ -5912,6 +5910,9 @@ msgstr ""
 "  /                søg (fortryd umiddelbart med retur)\n"
 "  \\                gentag sidste søgning\n"
 
+#~ msgid "must be at least two characters"
+#~ msgstr "skal have mindst to tegn"
+
 #~ msgid "no gcc-lib component"
 #~ msgstr "intet gcc-lib komponent"
 

po/de.po

@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Debian dpkg 1.9.16\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-04-25 18:54+0100\n"
+"POT-Creation-Date: 2004-06-01 18:18-0300\n"
 "PO-Revision-Date: 2002-05-27 18:54:02+0200\n"
 "Last-Translator: Michael Piefel <piefel@debian.org>\n"
 "Language-Team: German <de@li.org>\n"
@@ -60,17 +60,17 @@ msgstr "Systemfehler Nr. %d"
 msgid "Signal no.%d"
 msgstr "Signal Nr. %d"
 
-#: lib/database.c:124
+#: lib/database.c:125
 #, c-format
 msgid "couldn't allocate memory for strdup in findpackage(%s)"
 msgstr "konnte keinen Speicher für strdup in findpackage(%s) zuweisen"
 
-#: lib/database.c:194
+#: lib/database.c:195
 #, c-format
 msgid "size %7d occurs %5d times\n"
 msgstr "Größe %7d taucht %5d mal auf\n"
 
-#: lib/database.c:195
+#: lib/database.c:196
 msgid "failed write during hashreport"
 msgstr "Schreibfehler während des Hashreports"
 
@@ -756,41 +756,37 @@ msgstr "darf keine leere Zeichenkette sein"
 msgid "must start with an alphanumeric"
 msgstr "muss mit alphanumerischem Zeichen beginnen"
 
-#: lib/parsehelp.c:115
-msgid "must be at least two characters"
-msgstr "muss mindestens zwei Zeichen haben"
-
-#: lib/parsehelp.c:124
+#: lib/parsehelp.c:123
 #, c-format
 msgid "character `%c' not allowed - only letters, digits and %s allowed"
 msgstr "Zeichen »%c« nicht erlaubt - nur Buchstaben, Ziffern und %s erlaubt"
 
-#: lib/parsehelp.c:179
+#: lib/parsehelp.c:178
 msgid "<none>"
 msgstr "<keine>"
 
-#: lib/parsehelp.c:194
+#: lib/parsehelp.c:193
 msgid "version string is empty"
 msgstr "Versionszeichenkette ist leer"
 
-#: lib/parsehelp.c:205
+#: lib/parsehelp.c:204
 msgid "version string has embedded spaces"
 msgstr "Versionszeichenkette enthält Leerzeichen"
 
-#: lib/parsehelp.c:210
+#: lib/parsehelp.c:209
 msgid "epoch in version is not number"
 msgstr "Epoche in der Version ist keine Zahl"
 
-#: lib/parsehelp.c:211
+#: lib/parsehelp.c:210
 msgid "nothing after colon in version number"
 msgstr "nichts hinter Doppelpunkt in Versionsnummer"
 
-#: lib/parsehelp.c:233
+#: lib/parsehelp.c:232
 #, c-format
 msgid "missing %s"
 msgstr "%s fehlt"
 
-#: lib/parsehelp.c:237
+#: lib/parsehelp.c:236
 #, c-format
 msgid "empty value for %s"
 msgstr "leerer Wert für %s"
@@ -1486,86 +1482,86 @@ msgstr "Fehler beim Lesen von stdin am Conffile-Prompt"
 msgid "EOF on stdin at conffile prompt"
 msgstr "EOF auf stdin am Conffile-Prompt"
 
-#: main/depcon.c:74
+#: main/depcon.c:76
 #, c-format
 msgid "unable to check for existence of `%.250s'"
 msgstr "kann Existenz von »%.250s« nicht prüfen"
 
-#: main/depcon.c:134 main/packages.c:386
+#: main/depcon.c:153 main/packages.c:389
 msgid " depends on "
 msgstr " hängt ab von "
 
-#: main/depcon.c:135
+#: main/depcon.c:154
 msgid " pre-depends on "
 msgstr " hat Vor-Abhängigkeit mit "
 
-#: main/depcon.c:136
+#: main/depcon.c:155
 msgid " recommends "
 msgstr " empfiehlt "
 
-#: main/depcon.c:137
+#: main/depcon.c:156
 msgid " conflicts with "
 msgstr " kollidiert mit "
 
-#: main/depcon.c:138
+#: main/depcon.c:157
 msgid " suggests "
 msgstr " befürwortet "
 
-#: main/depcon.c:139
+#: main/depcon.c:158
 msgid " enhances "
 msgstr " erweitert "
 
-#: main/depcon.c:215
+#: main/depcon.c:234
 #, c-format
 msgid "  %.250s is to be removed.\n"
 msgstr "  %.250s soll entfernt werden.\n"
 
-#: main/depcon.c:218
+#: main/depcon.c:237
 #, c-format
 msgid "  %.250s is to be deconfigured.\n"
 msgstr "  %.250s soll dekonfiguriert werden.\n"
 
-#: main/depcon.c:222
+#: main/depcon.c:241
 #, c-format
 msgid "  %.250s is to be installed, but is version %.250s.\n"
 msgstr "  %.250s soll installiert werden, ist aber Version %.250s.\n"
 
-#: main/depcon.c:230
+#: main/depcon.c:249
 #, c-format
 msgid "  %.250s is installed, but is version %.250s.\n"
 msgstr "  %.250s ist installiert, ist aber Version %.250s.\n"
 
-#: main/depcon.c:245
+#: main/depcon.c:264
 #, c-format
 msgid "  %.250s is unpacked, but has never been configured.\n"
 msgstr "  %.250s ist entpackt, wurde aber nie konfiguriert.\n"
 
-#: main/depcon.c:249
+#: main/depcon.c:268
 #, c-format
 msgid "  %.250s is unpacked, but is version %.250s.\n"
 msgstr "  %.250s ist entpackt, ist aber Version %.250s.\n"
 
-#: main/depcon.c:255
+#: main/depcon.c:274
 #, c-format
 msgid "  %.250s latest configured version is %.250s.\n"
 msgstr "  %.250s letzte konfigurierte Version ist %.250s.\n"
 
-#: main/depcon.c:264
+#: main/depcon.c:283
 #, c-format
 msgid "  %.250s is %s.\n"
 msgstr "  %.250s ist %s.\n"
 
-#: main/depcon.c:300
+#: main/depcon.c:319
 #, c-format
 msgid "  %.250s provides %.250s but is to be removed.\n"
 msgstr "  %.250s liefert %.250s, soll aber entfernt werden.\n"
 
-#: main/depcon.c:304
+#: main/depcon.c:323
 #, c-format
 msgid "  %.250s provides %.250s but is to be deconfigured.\n"
 msgstr "  %.250s liefert %.250s, soll aber dekonfiguriert werden.\n"
 
-#: main/depcon.c:309
+#: main/depcon.c:328
 #, c-format
 msgid "  %.250s provides %.250s but is %s.\n"
 msgstr "  %.250s liefert %.250s, ist aber %s.\n"
@@ -1573,28 +1569,28 @@ msgstr "  %.250s liefert %.250s, ist aber %s.\n"
 #. If the package wasn't installed at all, and we haven't said
 #. * yet why this isn't satisfied, we should say so now.
 #.
-#: main/depcon.c:323
+#: main/depcon.c:342
 #, c-format
 msgid "  %.250s is not installed.\n"
 msgstr "  %.250s ist nicht installiert.\n"
 
-#: main/depcon.c:354
+#: main/depcon.c:373
 #, c-format
 msgid "  %.250s (version %.250s) is to be installed.\n"
 msgstr "  %.250s (Version %.250s) soll installiert werden.\n"
 
-#: main/depcon.c:368
+#: main/depcon.c:387
 #, c-format
 msgid "  %.250s (version %.250s) is %s.\n"
 msgstr "  %.250s (Version %.250s) ist %s.\n"
 
 #. conflicts and provides the same
-#: main/depcon.c:393
+#: main/depcon.c:412
 #, c-format
 msgid "  %.250s provides %.250s and is to be installed.\n"
 msgstr "  %.250s liefert %.250s und wird installiert.\n"
 
-#: main/depcon.c:424
+#: main/depcon.c:443
 #, c-format
 msgid "  %.250s provides %.250s and is %s.\n"
 msgstr "  %.250s liefert %.250s und ist %s.\n"
@@ -2120,7 +2116,7 @@ msgid " --licence for copyright and license details.\n"
 msgstr "--licence für Details zum Copyright und der Lizenz.\n"
 
 #: main/main.c:58
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "Usage: \n"
 "  dpkg -i|--install      <.deb file name> ... | -R|--recursive <dir> ...\n"
@@ -2182,11 +2178,11 @@ msgid ""
 "  --abort-after <n>              Abort after encountering <n> errors\n"
 "\n"
 "Comparison operators for --compare-versions are:\n"
-" lt le eq ne ge gt       (treat no version as earlier than any version);\n"
-" lt-nl le-nl ge-nl gt-nl (treat no version as later than any version);\n"
+" lt le eq ne ge gt       (treat empty version as earlier than any version);\n"
+" lt-nl le-nl ge-nl gt-nl (treat empty version as later than any version);\n"
 " < << <= = >= >> >       (only for compatibility with control file syntax).\n"
 "\n"
-"Use `dselect' 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"
@@ -2290,7 +2286,7 @@ msgstr ""
 "\n"
 "Optionen mit [*] geben viel aus - schicken Sie es durch »less« oder »more«!"
 
-#: main/main.c:185 main/query.c:506 dpkg-deb/main.c:157 split/main.c:144
+#: main/main.c:185 main/query.c:506 dpkg-deb/main.c:157 split/main.c:146
 #, c-format
 msgid "conflicting actions --%s and --%s"
 msgstr "Aktionen --%s und --%s stehen in Konflikt"
@@ -2489,7 +2485,7 @@ msgid "unexpected eof before end of line %d"
 msgstr "unerwartetes Dateiende vor Ende der Zeile %d"
 
 #: main/main.c:540 main/main.c:555 main/query.c:541 dpkg-deb/main.c:169
-#: split/main.c:157
+#: split/main.c:159
 msgid "need an action option"
 msgstr "brauche eine Aktions-Option"
 
@@ -2525,43 +2521,43 @@ msgstr ""
 "Mehr als eine Kopie des Paketes %s wurde in diesem Durchlauf\n"
 " entpackt! Es wird nur einmal konfiguriert.\n"
 
-#: main/packages.c:264 main/packages.c:308 main/packages.c:321
+#: main/packages.c:267 main/packages.c:311 main/packages.c:324
 msgid "  Package "
 msgstr "  Paket "
 
-#: main/packages.c:267 main/packages.c:311 main/packages.c:324
+#: main/packages.c:270 main/packages.c:314 main/packages.c:327
 msgid " which provides "
 msgstr " welches bereitstellt "
 
-#: main/packages.c:270
+#: main/packages.c:273
 msgid " is to be removed.\n"
 msgstr " soll gelöscht werden.\n"
 
-#: main/packages.c:282
+#: main/packages.c:285
 msgid "  Version of "
 msgstr "  Version von "
 
-#: main/packages.c:284
+#: main/packages.c:287
 msgid " on system is "
 msgstr " auf dem System ist "
 
-#: main/packages.c:304
+#: main/packages.c:307
 #, c-format
 msgid "dpkg: also configuring `%s' (required by `%s')\n"
 msgstr "dpkg: Konfiguriere auch »%s« (benötigt von »%s«)\n"
 
-#: main/packages.c:314
+#: main/packages.c:317
 msgid " is not configured yet.\n"
 msgstr " ist noch nicht konfiguriert.\n"
 
-#: main/packages.c:327
+#: main/packages.c:330
 msgid " is not installed.\n"
 msgstr " ist nicht installiert.\n"
 
 #. Don't print the line about the package to be removed if
 #. * that's the only line.
 #.
-#: main/packages.c:392
+#: main/packages.c:395
 msgid "; however:\n"
 msgstr "; aber:\n"
 
@@ -3522,10 +3518,10 @@ msgid "archive has malformatted ctrl len `%s'"
 msgstr "Archiv hat falsch formatierte ctrl-Länge »%s«"
 
 #: dpkg-deb/extract.c:193
-#, c-format
+#, fuzzy, c-format
 msgid ""
 " old debian package, version %s.\n"
-" size %ld bytes: control archive= %ld, main archive= %zi.\n"
+" size %ld bytes: control archive= %zi, main archive= %ld.\n"
 msgstr ""
 " altes Debian-Paket, Version %s.\n"
 " Größe %ld Byte: control-Archiv= %ld, Hauptarchiv= %zi.\n"
@@ -3930,7 +3926,7 @@ msgstr "Datei
 
 #
 #: split/info.c:188
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "%s:\n"
 "    Part format version:            %s\n"
@@ -3940,9 +3936,9 @@ msgid ""
 "        ... length:                 %lu bytes\n"
 "        ... split every:            %lu bytes\n"
 "    Part number:                    %d/%d\n"
-"    Part length:                    %lu bytes\n"
+"    Part length:                    %zi bytes\n"
 "    Part offset:                    %lu bytes\n"
-"    Part file size (used portion):  %zi bytes\n"
+"    Part file size (used portion):  %lu bytes\n"
 "\n"
 msgstr ""
 "%s:\n"
@@ -4003,12 +3999,12 @@ msgstr "--join braucht eine oder mehrere Teildateien als Argument"
 msgid "part %d is missing"
 msgstr "Teil %d fehlt"
 
-#: split/main.c:38
+#: split/main.c:40
 msgid "Debian GNU/Linux `dpkg-split' package split/join tool; version "
 msgstr ""
 "Debian GNU/Linux »dpkg-split« Paket-Aufteil/Zusammenfüg-Werkzeug; Version "
 
-#: split/main.c:40
+#: split/main.c:42
 msgid ""
 "Copyright (C) 1994-1996 Ian Jackson.  This is free software; see the\n"
 "GNU General Public Licence version 2 or later for copying conditions.\n"
@@ -4020,7 +4016,7 @@ msgstr ""
 "Es wird KEINE Haftung übernommen. Sehen Sie dpkg-split --licence für "
 "Details.\n"
 
-#: split/main.c:47
+#: split/main.c:49
 #, c-format
 msgid ""
 "Usage: dpkg-split -s|--split <file> [<prefix>]     Split an archive.\n"
@@ -4062,30 +4058,30 @@ msgstr ""
 "\n"
 "Exit-Status: 0 = OK;  1 = -a ist kein Teil;  2 = Probleme!\n"
 
-#: split/main.c:68
+#: split/main.c:70
 msgid "Type dpkg-split --help for help."
 msgstr "Geben Sie dpkg-split --help ein für Hilfe."
 
-#: split/main.c:78
+#: split/main.c:80
 #, c-format
 msgid "error reading %s"
 msgstr "Fehler beim Lesen von %s"
 
-#: split/main.c:82
+#: split/main.c:84
 #, c-format
 msgid "error reading %.250s"
 msgstr "Fehler beim Lesen von %.250s"
 
-#: split/main.c:83
+#: split/main.c:85
 #, c-format
 msgid "unexpected end of file in %.250s"
 msgstr "Unerwartetes Ende der Datei %.250s"
 
-#: split/main.c:103
+#: split/main.c:105
 msgid "part size is far too large or is not positive"
 msgstr "Teilgröße ist viel zu groß oder nicht positiv."
 
-#: split/main.c:107
+#: split/main.c:109
 #, c-format
 msgid "part size must be at least %dk (to allow for header)"
 msgstr "Teilgröße muss mindestens %dk sein (für den Header)"
@@ -4259,37 +4255,37 @@ msgstr "mdfile"
 msgid "%s: unrecognized line\n"
 msgstr "%s: Zeile nicht erkannt\n"
 
-#: utils/md5sum.c:284
+#: utils/md5sum.c:292
 #, c-format
 msgid "%s: can't open %s\n"
 msgstr "%s: kann %s nicht öffnen\n"
 
-#: utils/md5sum.c:288
+#: utils/md5sum.c:296
 #, c-format
 msgid "%s: error reading %s\n"
 msgstr "%s: Fehler beim Lesen von %s\n"
 
-#: utils/md5sum.c:294
+#: utils/md5sum.c:302
 #, c-format
 msgid "FAILED\n"
 msgstr "FEHLGESCHLAGEN\n"
 
-#: utils/md5sum.c:296
+#: utils/md5sum.c:304
 #, c-format
 msgid "%s: MD5 check failed for '%s'\n"
 msgstr "%s: MD5-Prüfung fehlgeschlagen bei »%s«\n"
 
-#: utils/md5sum.c:299
+#: utils/md5sum.c:307
 #, c-format
 msgid "OK\n"
 msgstr "OK\n"
 
-#: utils/md5sum.c:303
+#: utils/md5sum.c:311
 #, c-format
 msgid "%s: %d of %d file(s) failed MD5 check\n"
 msgstr "%s: %d von %d Datei(en) haben MD5-Prüfung nicht bestanden\n"
 
-#: utils/md5sum.c:305
+#: utils/md5sum.c:313
 #, c-format
 msgid "%s: no files checked\n"
 msgstr "%s: keine Dateien geprüft\n"
@@ -5364,9 +5360,10 @@ msgid " verbose:v help:?"
 msgstr " ausführlich:v Hilfe:?"
 
 #: dselect/pkginfo.cc:82
+#, fuzzy
 msgid ""
 "The line you have highlighted represents many packages; if you ask to "
-"install, remove, hold, &c it you will affect all the packages which match "
+"install, remove, hold, etc. it you will affect all the packages which match "
 "the criterion shown.\n"
 "\n"
 "If you move the highlight to a line for a particular package you will see "
@@ -5522,9 +5519,10 @@ msgid "Keystrokes"
 msgstr "Tastenkürzel"
 
 #: dselect/helpmsgs.cc:8
+#, fuzzy
 msgid ""
 "Motion keys: Next/Previous, Top/End, Up/Down, Backwards/Forwards:\n"
-"  n, Down-arrow, j      p, Up-arrow, k          move highlight\n"
+"  Down-arrow, j         Up-arrow, k             move highlight\n"
 "  N, Page-down, Space   P, Page-up, Backspace   scroll list by 1 page\n"
 "  ^n                    ^p                      scroll list by 1 line\n"
 "  t, Home               e, End                  jump to top/end of list\n"
@@ -5550,7 +5548,7 @@ msgid ""
 "   R     Revert to state before this list      ^l   redraw display\n"
 "   U     set all to sUggested state             /   search (Return to "
 "cancel)\n"
-"   D     set all to Directly requested state    \\   repeat last search\n"
+"   D     set all to Directly requested state  n, \\  repeat last search\n"
 msgstr ""
 "Bewegungstasten: Nächstes/Vorheriges, Anfang/Ende, Hoch/Runter, Rück-/"
 "Vorwärts:\n"
@@ -5992,6 +5990,9 @@ msgstr ""
 "  /                Suchen (Abbruch mit Eingabetaste)\n"
 "  \\                Weitersuchen\n"
 
+#~ msgid "must be at least two characters"
+#~ msgstr "muss mindestens zwei Zeichen haben"
+
 #~ msgid ""
 #~ "Your currently installed version of the file is in:\n"
 #~ " %s\n"

po/dpkg.pot

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-04-30 11:17+0200\n"
+"POT-Creation-Date: 2004-06-01 18:18-0300\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"
@@ -58,17 +58,17 @@ msgstr ""
 msgid "Signal no.%d"
 msgstr ""
 
-#: lib/database.c:124
+#: lib/database.c:125
 #, c-format
 msgid "couldn't allocate memory for strdup in findpackage(%s)"
 msgstr ""
 
-#: lib/database.c:194
+#: lib/database.c:195
 #, c-format
 msgid "size %7d occurs %5d times\n"
 msgstr ""
 
-#: lib/database.c:195
+#: lib/database.c:196
 msgid "failed write during hashreport"
 msgstr ""
 
@@ -731,41 +731,37 @@ msgstr ""
 msgid "must start with an alphanumeric"
 msgstr ""
 
-#: lib/parsehelp.c:115
-msgid "must be at least two characters"
-msgstr ""
-
-#: lib/parsehelp.c:124
+#: lib/parsehelp.c:123
 #, c-format
 msgid "character `%c' not allowed - only letters, digits and %s allowed"
 msgstr ""
 
-#: lib/parsehelp.c:179
+#: lib/parsehelp.c:178
 msgid "<none>"
 msgstr ""
 
-#: lib/parsehelp.c:194
+#: lib/parsehelp.c:193
 msgid "version string is empty"
 msgstr ""
 
-#: lib/parsehelp.c:205
+#: lib/parsehelp.c:204
 msgid "version string has embedded spaces"
 msgstr ""
 
-#: lib/parsehelp.c:210
+#: lib/parsehelp.c:209
 msgid "epoch in version is not number"
 msgstr ""
 
-#: lib/parsehelp.c:211
+#: lib/parsehelp.c:210
 msgid "nothing after colon in version number"
 msgstr ""
 
-#: lib/parsehelp.c:233
+#: lib/parsehelp.c:232
 #, c-format
 msgid "missing %s"
 msgstr ""
 
-#: lib/parsehelp.c:237
+#: lib/parsehelp.c:236
 #, c-format
 msgid "empty value for %s"
 msgstr ""
@@ -1385,86 +1381,86 @@ msgstr ""
 msgid "EOF on stdin at conffile prompt"
 msgstr ""
 
-#: main/depcon.c:74
+#: main/depcon.c:76
 #, c-format
 msgid "unable to check for existence of `%.250s'"
 msgstr ""
 
-#: main/depcon.c:134 main/packages.c:386
+#: main/depcon.c:153 main/packages.c:389
 msgid " depends on "
 msgstr ""
 
-#: main/depcon.c:135
+#: main/depcon.c:154
 msgid " pre-depends on "
 msgstr ""
 
-#: main/depcon.c:136
+#: main/depcon.c:155
 msgid " recommends "
 msgstr ""
 
-#: main/depcon.c:137
+#: main/depcon.c:156
 msgid " conflicts with "
 msgstr ""
 
-#: main/depcon.c:138
+#: main/depcon.c:157
 msgid " suggests "
 msgstr ""
 
-#: main/depcon.c:139
+#: main/depcon.c:158
 msgid " enhances "
 msgstr ""
 
-#: main/depcon.c:215
+#: main/depcon.c:234
 #, c-format
 msgid "  %.250s is to be removed.\n"
 msgstr ""
 
-#: main/depcon.c:218
+#: main/depcon.c:237
 #, c-format
 msgid "  %.250s is to be deconfigured.\n"
 msgstr ""
 
-#: main/depcon.c:222
+#: main/depcon.c:241
 #, c-format
 msgid "  %.250s is to be installed, but is version %.250s.\n"
 msgstr ""
 
-#: main/depcon.c:230
+#: main/depcon.c:249
 #, c-format
 msgid "  %.250s is installed, but is version %.250s.\n"
 msgstr ""
 
-#: main/depcon.c:245
+#: main/depcon.c:264
 #, c-format
 msgid "  %.250s is unpacked, but has never been configured.\n"
 msgstr ""
 
-#: main/depcon.c:249
+#: main/depcon.c:268
 #, c-format
 msgid "  %.250s is unpacked, but is version %.250s.\n"
 msgstr ""
 
-#: main/depcon.c:255
+#: main/depcon.c:274
 #, c-format
 msgid "  %.250s latest configured version is %.250s.\n"
 msgstr ""
 
-#: main/depcon.c:264
+#: main/depcon.c:283
 #, c-format
 msgid "  %.250s is %s.\n"
 msgstr ""
 
-#: main/depcon.c:300
+#: main/depcon.c:319
 #, c-format
 msgid "  %.250s provides %.250s but is to be removed.\n"
 msgstr ""
 
-#: main/depcon.c:304
+#: main/depcon.c:323
 #, c-format
 msgid "  %.250s provides %.250s but is to be deconfigured.\n"
 msgstr ""
 
-#: main/depcon.c:309
+#: main/depcon.c:328
 #, c-format
 msgid "  %.250s provides %.250s but is %s.\n"
 msgstr ""
@@ -1472,28 +1468,28 @@ msgstr ""
 #. If the package wasn't installed at all, and we haven't said
 #. * yet why this isn't satisfied, we should say so now.
 #.
-#: main/depcon.c:323
+#: main/depcon.c:342
 #, c-format
 msgid "  %.250s is not installed.\n"
 msgstr ""
 
-#: main/depcon.c:354
+#: main/depcon.c:373
 #, c-format
 msgid "  %.250s (version %.250s) is to be installed.\n"
 msgstr ""
 
-#: main/depcon.c:368
+#: main/depcon.c:387
 #, c-format
 msgid "  %.250s (version %.250s) is %s.\n"
 msgstr ""
 
 #. conflicts and provides the same
-#: main/depcon.c:393
+#: main/depcon.c:412
 #, c-format
 msgid "  %.250s provides %.250s and is to be installed.\n"
 msgstr ""
 
-#: main/depcon.c:424
+#: main/depcon.c:443
 #, c-format
 msgid "  %.250s provides %.250s and is %s.\n"
 msgstr ""
@@ -2037,11 +2033,11 @@ msgid ""
 "  --abort-after <n>              Abort after encountering <n> errors\n"
 "\n"
 "Comparison operators for --compare-versions are:\n"
-" lt le eq ne ge gt       (treat no version as earlier than any version);\n"
-" lt-nl le-nl ge-nl gt-nl (treat no version as later than any version);\n"
+" lt le eq ne ge gt       (treat empty version as earlier than any version);\n"
+" lt-nl le-nl ge-nl gt-nl (treat empty version as later than any version);\n"
 " < << <= = >= >> >       (only for compatibility with control file syntax).\n"
 "\n"
-"Use `dselect' for user-friendly package management.\n"
+"Use `dselect' or 'aptitude' for user-friendly package management.\n"
 msgstr ""
 
 #: main/main.c:120
@@ -2058,7 +2054,7 @@ msgid ""
 "`more' !"
 msgstr ""
 
-#: main/main.c:185 main/query.c:506 dpkg-deb/main.c:157 split/main.c:144
+#: main/main.c:185 main/query.c:506 dpkg-deb/main.c:157 split/main.c:146
 #, c-format
 msgid "conflicting actions --%s and --%s"
 msgstr ""
@@ -2190,7 +2186,7 @@ msgid "unexpected eof before end of line %d"
 msgstr ""
 
 #: main/main.c:540 main/main.c:555 main/query.c:541 dpkg-deb/main.c:169
-#: split/main.c:157
+#: split/main.c:159
 msgid "need an action option"
 msgstr ""
 
@@ -2222,43 +2218,43 @@ msgid ""
 " in this run !  Only configuring it once.\n"
 msgstr ""
 
-#: main/packages.c:264 main/packages.c:308 main/packages.c:321
+#: main/packages.c:267 main/packages.c:311 main/packages.c:324
 msgid "  Package "
 msgstr ""
 
-#: main/packages.c:267 main/packages.c:311 main/packages.c:324
+#: main/packages.c:270 main/packages.c:314 main/packages.c:327
 msgid " which provides "
 msgstr ""
 
-#: main/packages.c:270
+#: main/packages.c:273
 msgid " is to be removed.\n"
 msgstr ""
 
-#: main/packages.c:282
+#: main/packages.c:285
 msgid "  Version of "
 msgstr ""
 
-#: main/packages.c:284
+#: main/packages.c:287
 msgid " on system is "
 msgstr ""
 
-#: main/packages.c:304
+#: main/packages.c:307
 #, c-format
 msgid "dpkg: also configuring `%s' (required by `%s')\n"
 msgstr ""
 
-#: main/packages.c:314
+#: main/packages.c:317
 msgid " is not configured yet.\n"
 msgstr ""
 
-#: main/packages.c:327
+#: main/packages.c:330
 msgid " is not installed.\n"
 msgstr ""
 
 #. Don't print the line about the package to be removed if
 #. * that's the only line.
 #.
-#: main/packages.c:392
+#: main/packages.c:395
 msgid "; however:\n"
 msgstr ""
 
@@ -3134,7 +3130,7 @@ msgstr ""
 #, c-format
 msgid ""
 " old debian package, version %s.\n"
-" size %ld bytes: control archive= %ld, main archive= %zi.\n"
+" size %ld bytes: control archive= %zi, main archive= %ld.\n"
 msgstr ""
 
 #: dpkg-deb/extract.c:202
@@ -3489,9 +3485,9 @@ msgid ""
 "        ... length:                 %lu bytes\n"
 "        ... split every:            %lu bytes\n"
 "    Part number:                    %d/%d\n"
-"    Part length:                    %lu bytes\n"
+"    Part length:                    %zi bytes\n"
 "    Part offset:                    %lu bytes\n"
-"    Part file size (used portion):  %zi bytes\n"
+"    Part file size (used portion):  %lu bytes\n"
 "\n"
 msgstr ""
 
@@ -3538,18 +3534,18 @@ msgstr ""
 msgid "part %d is missing"
 msgstr ""
 
-#: split/main.c:38
+#: split/main.c:40
 msgid "Debian GNU/Linux `dpkg-split' package split/join tool; version "
 msgstr ""
 
-#: split/main.c:40
+#: split/main.c:42
 msgid ""
 "Copyright (C) 1994-1996 Ian Jackson.  This is free software; see the\n"
 "GNU General Public Licence version 2 or later for copying conditions.\n"
 "There is NO warranty.  See dpkg-split --licence for details.\n"
 msgstr ""
 
-#: split/main.c:47
+#: split/main.c:49
 #, c-format
 msgid ""
 "Usage: dpkg-split -s|--split <file> [<prefix>]     Split an archive.\n"
@@ -3574,30 +3570,30 @@ msgid ""
 "Exit status: 0 = OK;  1 = -a is not a part;  2 = trouble!\n"
 msgstr ""
 
-#: split/main.c:68
+#: split/main.c:70
 msgid "Type dpkg-split --help for help."
 msgstr ""
 
-#: split/main.c:78
+#: split/main.c:80
 #, c-format
 msgid "error reading %s"
 msgstr ""
 
-#: split/main.c:82
+#: split/main.c:84
 #, c-format
 msgid "error reading %.250s"
 msgstr ""
 
-#: split/main.c:83
+#: split/main.c:85
 #, c-format
 msgid "unexpected end of file in %.250s"
 msgstr ""
 
-#: split/main.c:103
+#: split/main.c:105
 msgid "part size is far too large or is not positive"
 msgstr ""
 
-#: split/main.c:107
+#: split/main.c:109
 #, c-format
 msgid "part size must be at least %dk (to allow for header)"
 msgstr ""
@@ -3764,37 +3760,37 @@ msgstr ""
 msgid "%s: unrecognized line\n"
 msgstr ""
 
-#: utils/md5sum.c:284
+#: utils/md5sum.c:292
 #, c-format
 msgid "%s: can't open %s\n"
 msgstr ""
 
-#: utils/md5sum.c:288
+#: utils/md5sum.c:296
 #, c-format
 msgid "%s: error reading %s\n"
 msgstr ""
 
-#: utils/md5sum.c:294
+#: utils/md5sum.c:302
 #, c-format
 msgid "FAILED\n"
 msgstr ""
 
-#: utils/md5sum.c:296
+#: utils/md5sum.c:304
 #, c-format
 msgid "%s: MD5 check failed for '%s'\n"
 msgstr ""
 
-#: utils/md5sum.c:299
+#: utils/md5sum.c:307
 #, c-format
 msgid "OK\n"
 msgstr ""
 
-#: utils/md5sum.c:303
+#: utils/md5sum.c:311
 #, c-format
 msgid "%s: %d of %d file(s) failed MD5 check\n"
 msgstr ""
 
-#: utils/md5sum.c:305
+#: utils/md5sum.c:313
 #, c-format
 msgid "%s: no files checked\n"
 msgstr ""
@@ -4824,7 +4820,7 @@ msgstr ""
 #: dselect/pkginfo.cc:82
 msgid ""
 "The line you have highlighted represents many packages; if you ask to "
-"install, remove, hold, &c it you will affect all the packages which match "
+"install, remove, hold, etc. it you will affect all the packages which match "
 "the criterion shown.\n"
 "\n"
 "If you move the highlight to a line for a particular package you will see "
@@ -4974,7 +4970,7 @@ msgstr ""
 #: dselect/helpmsgs.cc:8
 msgid ""
 "Motion keys: Next/Previous, Top/End, Up/Down, Backwards/Forwards:\n"
-"  n, Down-arrow, j      p, Up-arrow, k          move highlight\n"
+"  Down-arrow, j         Up-arrow, k             move highlight\n"
 "  N, Page-down, Space   P, Page-up, Backspace   scroll list by 1 page\n"
 "  ^n                    ^p                      scroll list by 1 line\n"
 "  t, Home               e, End                  jump to top/end of list\n"
@@ -5000,7 +4996,7 @@ msgid ""
 "   R     Revert to state before this list      ^l   redraw display\n"
 "   U     set all to sUggested state             /   search (Return to "
 "cancel)\n"
-"   D     set all to Directly requested state    \\   repeat last search\n"
+"   D     set all to Directly requested state  n, \\  repeat last search\n"
 msgstr ""
 
 #: dselect/helpmsgs.cc:33

po/en.po

@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dpkg 1.10\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-04-25 18:54+0100\n"
+"POT-Creation-Date: 2004-06-01 18:18-0300\n"
 "PO-Revision-Date: 2003-04-26 10:50-0500\n"
 "Last-Translator: Dpkg Mailing List <debian-dpkg@lists.debian.org>\n"
 "Language-Team: Dpkg Mailing List <debian-dpkg@lists.debian.org>\n"
@@ -56,18 +56,18 @@ msgstr "System error no.%d"
 msgid "Signal no.%d"
 msgstr "Signal no.%d"
 
-#: lib/database.c:124
+#: lib/database.c:125
 #, fuzzy, c-format
 msgid "couldn't allocate memory for strdup in findpackage(%s)"
 msgstr ""
 "dpkg: failed to allocate memory for new entry in list of failed packages."
 
-#: lib/database.c:194
+#: lib/database.c:195
 #, c-format
 msgid "size %7d occurs %5d times\n"
 msgstr ""
 
-#: lib/database.c:195
+#: lib/database.c:196
 msgid "failed write during hashreport"
 msgstr "failed write during hashreport"
 
@@ -746,42 +746,38 @@ msgstr "may not be empty string"
 msgid "must start with an alphanumeric"
 msgstr "must start with an alphanumeric"
 
-#: lib/parsehelp.c:115
-msgid "must be at least two characters"
-msgstr "must be at least two characters"
-
-#: lib/parsehelp.c:124
+#: lib/parsehelp.c:123
 #, c-format
 msgid "character `%c' not allowed - only letters, digits and %s allowed"
 msgstr "character `%c' not allowed - only letters, digits and %s allowed"
 
-#: lib/parsehelp.c:179
+#: lib/parsehelp.c:178
 msgid "<none>"
 msgstr ""
 
-#: lib/parsehelp.c:194
+#: lib/parsehelp.c:193
 msgid "version string is empty"
 msgstr "version string is empty"
 
-#: lib/parsehelp.c:205
+#: lib/parsehelp.c:204
 #, fuzzy
 msgid "version string has embedded spaces"
 msgstr "version string is empty"
 
-#: lib/parsehelp.c:210
+#: lib/parsehelp.c:209
 msgid "epoch in version is not number"
 msgstr "epoch in version is not number"
 
-#: lib/parsehelp.c:211
+#: lib/parsehelp.c:210
 msgid "nothing after colon in version number"
 msgstr "nothing after colon in version number"
 
-#: lib/parsehelp.c:233
+#: lib/parsehelp.c:232
 #, c-format
 msgid "missing %s"
 msgstr "missing %s"
 
-#: lib/parsehelp.c:237
+#: lib/parsehelp.c:236
 #, c-format
 msgid "empty value for %s"
 msgstr "empty value for %s"
@@ -1455,86 +1451,86 @@ msgstr "read error on stdin at conffile prompt"
 msgid "EOF on stdin at conffile prompt"
 msgstr "EOF on stdin at conffile prompt"
 
-#: main/depcon.c:74
+#: main/depcon.c:76
 #, c-format
 msgid "unable to check for existence of `%.250s'"
 msgstr "unable to check for existence of `%.250s'"
 
-#: main/depcon.c:134 main/packages.c:386
+#: main/depcon.c:153 main/packages.c:389
 msgid " depends on "
 msgstr " depends on "
 
-#: main/depcon.c:135
+#: main/depcon.c:154
 msgid " pre-depends on "
 msgstr " pre-depends on "
 
-#: main/depcon.c:136
+#: main/depcon.c:155
 msgid " recommends "
 msgstr " recommends "
 
-#: main/depcon.c:137
+#: main/depcon.c:156
 msgid " conflicts with "
 msgstr " conflicts with "
 
-#: main/depcon.c:138
+#: main/depcon.c:157
 msgid " suggests "
 msgstr ""
 
-#: main/depcon.c:139
+#: main/depcon.c:158
 msgid " enhances "
 msgstr ""
 
-#: main/depcon.c:215
+#: main/depcon.c:234
 #, c-format
 msgid "  %.250s is to be removed.\n"
 msgstr "  %.250s is to be removed.\n"
 
-#: main/depcon.c:218
+#: main/depcon.c:237
 #, c-format
 msgid "  %.250s is to be deconfigured.\n"
 msgstr "  %.250s is to be deconfigured.\n"
 
-#: main/depcon.c:222
+#: main/depcon.c:241
 #, c-format
 msgid "  %.250s is to be installed, but is version %.250s.\n"
 msgstr "  %.250s is to be installed, but is version %.250s.\n"
 
-#: main/depcon.c:230
+#: main/depcon.c:249
 #, c-format
 msgid "  %.250s is installed, but is version %.250s.\n"
 msgstr "  %.250s is installed, but is version %.250s.\n"
 
-#: main/depcon.c:245
+#: main/depcon.c:264
 #, c-format
 msgid "  %.250s is unpacked, but has never been configured.\n"
 msgstr "  %.250s is unpacked, but has never been configured.\n"
 
-#: main/depcon.c:249
+#: main/depcon.c:268
 #, c-format
 msgid "  %.250s is unpacked, but is version %.250s.\n"
 msgstr "  %.250s is unpacked, but is version %.250s.\n"
 
-#: main/depcon.c:255
+#: main/depcon.c:274
 #, c-format
 msgid "  %.250s latest configured version is %.250s.\n"
 msgstr "  %.250s latest configured version is %.250s.\n"
 
-#: main/depcon.c:264
+#: main/depcon.c:283
 #, c-format
 msgid "  %.250s is %s.\n"
 msgstr "  %.250s is %s.\n"
 
-#: main/depcon.c:300
+#: main/depcon.c:319
 #, c-format
 msgid "  %.250s provides %.250s but is to be removed.\n"
 msgstr "  %.250s provides %.250s but is to be removed.\n"
 
-#: main/depcon.c:304
+#: main/depcon.c:323
 #, c-format
 msgid "  %.250s provides %.250s but is to be deconfigured.\n"
 msgstr "  %.250s provides %.250s but is to be deconfigured.\n"
 
-#: main/depcon.c:309
+#: main/depcon.c:328
 #, c-format
 msgid "  %.250s provides %.250s but is %s.\n"
 msgstr "  %.250s provides %.250s but is %s.\n"
@@ -1542,28 +1538,28 @@ msgstr "  %.250s provides %.250s but is %s.\n"
 #. If the package wasn't installed at all, and we haven't said
 #. * yet why this isn't satisfied, we should say so now.
 #.
-#: main/depcon.c:323
+#: main/depcon.c:342
 #, fuzzy, c-format
 msgid "  %.250s is not installed.\n"
 msgstr " is not installed.\n"
 
-#: main/depcon.c:354
+#: main/depcon.c:373
 #, c-format
 msgid "  %.250s (version %.250s) is to be installed.\n"
 msgstr "  %.250s (version %.250s) is to be installed.\n"
 
-#: main/depcon.c:368
+#: main/depcon.c:387
 #, c-format
 msgid "  %.250s (version %.250s) is %s.\n"
 msgstr "  %.250s (version %.250s) is %s.\n"
 
 #. conflicts and provides the same
-#: main/depcon.c:393
+#: main/depcon.c:412
 #, c-format
 msgid "  %.250s provides %.250s and is to be installed.\n"
 msgstr "  %.250s provides %.250s and is to be installed.\n"
 
-#: main/depcon.c:424
+#: main/depcon.c:443
 #, c-format
 msgid "  %.250s provides %.250s and is %s.\n"
 msgstr "  %.250s provides %.250s and is %s.\n"
@@ -2148,11 +2144,11 @@ msgid ""
 "  --abort-after <n>              Abort after encountering <n> errors\n"
 "\n"
 "Comparison operators for --compare-versions are:\n"
-" lt le eq ne ge gt       (treat no version as earlier than any version);\n"
-" lt-nl le-nl ge-nl gt-nl (treat no version as later than any version);\n"
+" lt le eq ne ge gt       (treat empty version as earlier than any version);\n"
+" lt-nl le-nl ge-nl gt-nl (treat empty version as later than any version);\n"
 " < << <= = >= >> >       (only for compatibility with control file syntax).\n"
 "\n"
-"Use `dselect' for user-friendly package management.\n"
+"Use `dselect' or 'aptitude' for user-friendly package management.\n"
 msgstr ""
 
 #: main/main.c:120
@@ -2179,7 +2175,7 @@ msgstr ""
 "Options marked [*] produce a lot of output - pipe it through `less' or "
 "`more' !"
 
-#: main/main.c:185 main/query.c:506 dpkg-deb/main.c:157 split/main.c:144
+#: main/main.c:185 main/query.c:506 dpkg-deb/main.c:157 split/main.c:146
 #, c-format
 msgid "conflicting actions --%s and --%s"
 msgstr "conflicting actions --%s and --%s"
@@ -2339,7 +2335,7 @@ msgid "unexpected eof before end of line %d"
 msgstr "unexpected eof after package name at line %d"
 
 #: main/main.c:540 main/main.c:555 main/query.c:541 dpkg-deb/main.c:169
-#: split/main.c:157
+#: split/main.c:159
 msgid "need an action option"
 msgstr "need an action option"
 
@@ -2375,43 +2371,43 @@ msgstr ""
 "More than one copy of package %s has been unpacked\n"
 " in this run !  Only configuring it once.\n"
 
-#: main/packages.c:264 main/packages.c:308 main/packages.c:321
+#: main/packages.c:267 main/packages.c:311 main/packages.c:324
 msgid "  Package "
 msgstr "  Package "
 
-#: main/packages.c:267 main/packages.c:311 main/packages.c:324
+#: main/packages.c:270 main/packages.c:314 main/packages.c:327
 msgid " which provides "
 msgstr " which provides "
 
-#: main/packages.c:270
+#: main/packages.c:273
 msgid " is to be removed.\n"
 msgstr " is to be removed.\n"
 
-#: main/packages.c:282
+#: main/packages.c:285
 msgid "  Version of "
 msgstr "  Version of "
 
-#: main/packages.c:284
+#: main/packages.c:287
 msgid " on system is "
 msgstr " on system is "
 
-#: main/packages.c:304
+#: main/packages.c:307
 #, c-format
 msgid "dpkg: also configuring `%s' (required by `%s')\n"
 msgstr "dpkg: also configuring `%s' (required by `%s')\n"
 
-#: main/packages.c:314
+#: main/packages.c:317
 msgid " is not configured yet.\n"
 msgstr " is not configured yet.\n"
 
-#: main/packages.c:327
+#: main/packages.c:330
 msgid " is not installed.\n"
 msgstr " is not installed.\n"
 
 #. Don't print the line about the package to be removed if
 #. * that's the only line.
 #.
-#: main/packages.c:392
+#: main/packages.c:395
 msgid "; however:\n"
 msgstr "; however:\n"
 
@@ -3328,7 +3324,7 @@ msgstr "archive has malformatted ctrl len `%s'"
 #, fuzzy, c-format
 msgid ""
 " old debian package, version %s.\n"
-" size %ld bytes: control archive= %ld, main archive= %zi.\n"
+" size %ld bytes: control archive= %zi, main archive= %ld.\n"
 msgstr ""
 " old debian package, version %s.\n"
 " size %ld bytes: control archive= %ld, main archive= %ld.\n"
@@ -3721,9 +3717,9 @@ msgid ""
 "        ... length:                 %lu bytes\n"
 "        ... split every:            %lu bytes\n"
 "    Part number:                    %d/%d\n"
-"    Part length:                    %lu bytes\n"
+"    Part length:                    %zi bytes\n"
 "    Part offset:                    %lu bytes\n"
-"    Part file size (used portion):  %zi bytes\n"
+"    Part file size (used portion):  %lu bytes\n"
 "\n"
 msgstr ""
 "%s:\n"
@@ -3782,12 +3778,12 @@ msgstr "--join requires one or more part file arguments"
 msgid "part %d is missing"
 msgstr "part %d is missing"
 
-#: split/main.c:38
+#: split/main.c:40
 #, fuzzy
 msgid "Debian GNU/Linux `dpkg-split' package split/join tool; version "
 msgstr "Debian Linux `dpkg-split' package split/join tool; version "
 
-#: split/main.c:40
+#: split/main.c:42
 msgid ""
 "Copyright (C) 1994-1996 Ian Jackson.  This is free software; see the\n"
 "GNU General Public Licence version 2 or later for copying conditions.\n"
@@ -3797,7 +3793,7 @@ msgstr ""
 "GNU General Public Licence version 2 or later for copying conditions.\n"
 "There is NO warranty.  See dpkg-split --licence for details.\n"
 
-#: split/main.c:47
+#: split/main.c:49
 #, fuzzy, c-format
 msgid ""
 "Usage: dpkg-split -s|--split <file> [<prefix>]     Split an archive.\n"
@@ -3835,30 +3831,30 @@ msgstr ""
 "\n"
 "Options:  --depotdir <directory>  (default is "
 
-#: split/main.c:68
+#: split/main.c:70
 msgid "Type dpkg-split --help for help."
 msgstr "Type dpkg-split --help for help."
 
-#: split/main.c:78
+#: split/main.c:80
 #, c-format
 msgid "error reading %s"
 msgstr "error reading %s"
 
-#: split/main.c:82
+#: split/main.c:84
 #, c-format
 msgid "error reading %.250s"
 msgstr "error reading %.250s"
 
-#: split/main.c:83
+#: split/main.c:85
 #, c-format
 msgid "unexpected end of file in %.250s"
 msgstr "unexpected end of file in %.250s"
 
-#: split/main.c:103
+#: split/main.c:105
 msgid "part size is far too large or is not positive"
 msgstr "part size is far too large or is not positive"
 
-#: split/main.c:107
+#: split/main.c:109
 #, c-format
 msgid "part size must be at least %dk (to allow for header)"
 msgstr "part size must be at least %dk (to allow for header)"
@@ -4033,37 +4029,37 @@ msgstr ""
 msgid "%s: unrecognized line\n"
 msgstr "%s: unrecognized line: %s"
 
-#: utils/md5sum.c:284
+#: utils/md5sum.c:292
 #, c-format
 msgid "%s: can't open %s\n"
 msgstr "%s: can't open %s\n"
 
-#: utils/md5sum.c:288
+#: utils/md5sum.c:296
 #, c-format
 msgid "%s: error reading %s\n"
 msgstr "%s: error reading %s\n"
 
-#: utils/md5sum.c:294
+#: utils/md5sum.c:302
 #, c-format
 msgid "FAILED\n"
 msgstr "FAILED\n"
 
-#: utils/md5sum.c:296
+#: utils/md5sum.c:304
 #, c-format
 msgid "%s: MD5 check failed for '%s'\n"
 msgstr "%s: MD5 check failed for '%s'\n"
 
-#: utils/md5sum.c:299
+#: utils/md5sum.c:307
 #, c-format
 msgid "OK\n"
 msgstr "OK\n"
 
-#: utils/md5sum.c:303
+#: utils/md5sum.c:311
 #, c-format
 msgid "%s: %d of %d file(s) failed MD5 check\n"
 msgstr "%s: %d of %d file(s) failed MD5 check\n"
 
-#: utils/md5sum.c:305
+#: utils/md5sum.c:313
 #, c-format
 msgid "%s: no files checked\n"
 msgstr "%s: no files checked\n"
@@ -5129,7 +5125,7 @@ msgstr ""
 #: dselect/pkginfo.cc:82
 msgid ""
 "The line you have highlighted represents many packages; if you ask to "
-"install, remove, hold, &c it you will affect all the packages which match "
+"install, remove, hold, etc. it you will affect all the packages which match "
 "the criterion shown.\n"
 "\n"
 "If you move the highlight to a line for a particular package you will see "
@@ -5285,7 +5281,7 @@ msgstr ""
 #: dselect/helpmsgs.cc:8
 msgid ""
 "Motion keys: Next/Previous, Top/End, Up/Down, Backwards/Forwards:\n"
-"  n, Down-arrow, j      p, Up-arrow, k          move highlight\n"
+"  Down-arrow, j         Up-arrow, k             move highlight\n"
 "  N, Page-down, Space   P, Page-up, Backspace   scroll list by 1 page\n"
 "  ^n                    ^p                      scroll list by 1 line\n"
 "  t, Home               e, End                  jump to top/end of list\n"
@@ -5311,7 +5307,7 @@ msgid ""
 "   R     Revert to state before this list      ^l   redraw display\n"
 "   U     set all to sUggested state             /   search (Return to "
 "cancel)\n"
-"   D     set all to Directly requested state    \\   repeat last search\n"
+"   D     set all to Directly requested state  n, \\  repeat last search\n"
 msgstr ""
 
 #: dselect/helpmsgs.cc:33
@@ -5537,6 +5533,9 @@ msgid ""
 "  \\                repeat last search\n"
 msgstr ""
 
+#~ msgid "must be at least two characters"
+#~ msgstr "must be at least two characters"
+
 #~ msgid "no gcc-lib component"
 #~ msgstr "no gcc-lib component"
 

po/es.po

@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Debian dpkg 1.10.18\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-04-25 18:54+0100\n"
+"POT-Creation-Date: 2004-06-01 18:18-0300\n"
 "PO-Revision-Date: 2004-03-26 19:10+0100\n"
 "Last-Translator: Santiago Vila <sanvila@debian.org>\n"
 "Language-Team: Spanish <debian-l10n-spanish@lists.debian.org>\n"
@@ -61,17 +61,17 @@ msgstr "Error del sistema n
 msgid "Signal no.%d"
 msgstr "Señal nº%d"
 
-#: lib/database.c:124
+#: lib/database.c:125
 #, c-format
 msgid "couldn't allocate memory for strdup in findpackage(%s)"
 msgstr "no se pudo asignar memoria para strdup en findpackage(%s)"
 
-#: lib/database.c:194
+#: lib/database.c:195
 #, c-format
 msgid "size %7d occurs %5d times\n"
 msgstr "el tamaño %7d aparece %5d veces\n"
 
-#: lib/database.c:195
+#: lib/database.c:196
 msgid "failed write during hashreport"
 msgstr "escritura fallida en informe de tipo `hash'"
 
@@ -784,12 +784,8 @@ msgstr "no puede ser una cadena vac
 msgid "must start with an alphanumeric"
 msgstr "debe comenzar con un carácter alfanumérico"
 
-#: lib/parsehelp.c:115
-msgid "must be at least two characters"
-msgstr "debe tener al menos dos caracteres"
-
 # FIXME: %s may not be translated. sv
-#: lib/parsehelp.c:124
+#: lib/parsehelp.c:123
 #, c-format
 msgid "character `%c' not allowed - only letters, digits and %s allowed"
 msgstr ""
@@ -798,32 +794,32 @@ msgstr ""
 
 # FIXME: A translator comment should clarify about none's sex here. sv
 # Esto sale cuando no hay ninguna versión disponible.
-#: lib/parsehelp.c:179
+#: lib/parsehelp.c:178
 msgid "<none>"
 msgstr "<ninguna>"
 
-#: lib/parsehelp.c:194
+#: lib/parsehelp.c:193
 msgid "version string is empty"
 msgstr "la cadena de versión está vacía"
 
-#: lib/parsehelp.c:205
+#: lib/parsehelp.c:204
 msgid "version string has embedded spaces"
 msgstr "la cadena de versión tiene espacios en su interior"
 
-#: lib/parsehelp.c:210
+#: lib/parsehelp.c:209
 msgid "epoch in version is not number"
 msgstr "la época en la versión no es un número"
 
-#: lib/parsehelp.c:211
+#: lib/parsehelp.c:210
 msgid "nothing after colon in version number"
 msgstr "no hay nada tras los dos puntos en el número de versión"
 
-#: lib/parsehelp.c:233
+#: lib/parsehelp.c:232
 #, c-format
 msgid "missing %s"
 msgstr "falta %s"
 
-#: lib/parsehelp.c:237
+#: lib/parsehelp.c:236
 #, c-format
 msgid "empty value for %s"
 msgstr "valor vacío para %s"
@@ -1544,86 +1540,86 @@ msgstr "error de lectura en la entrada est
 msgid "EOF on stdin at conffile prompt"
 msgstr "EOF en la entrada estándar al preguntar sobre conffiles"
 
-#: main/depcon.c:74
+#: main/depcon.c:76
 #, c-format
 msgid "unable to check for existence of `%.250s'"
 msgstr "no se puede comprobar la existencia de `%.250s'"
 
-#: main/depcon.c:134 main/packages.c:386
+#: main/depcon.c:153 main/packages.c:389
 msgid " depends on "
 msgstr " depende de "
 
-#: main/depcon.c:135
+#: main/depcon.c:154
 msgid " pre-depends on "
 msgstr " predepende de "
 
-#: main/depcon.c:136
+#: main/depcon.c:155
 msgid " recommends "
 msgstr " recomienda "
 
-#: main/depcon.c:137
+#: main/depcon.c:156
 msgid " conflicts with "
 msgstr " hace conflicto con "
 
-#: main/depcon.c:138
+#: main/depcon.c:157
 msgid " suggests "
 msgstr " sugiere "
 
-#: main/depcon.c:139
+#: main/depcon.c:158
 msgid " enhances "
 msgstr " mejora "
 
-#: main/depcon.c:215
+#: main/depcon.c:234
 #, c-format
 msgid "  %.250s is to be removed.\n"
 msgstr "  %.250s va a ser desinstalado.\n"
 
-#: main/depcon.c:218
+#: main/depcon.c:237
 #, c-format
 msgid "  %.250s is to be deconfigured.\n"
 msgstr "  %.250s va a ser desconfigurado.\n"
 
-#: main/depcon.c:222
+#: main/depcon.c:241
 #, c-format
 msgid "  %.250s is to be installed, but is version %.250s.\n"
 msgstr "   %.250s va a ser instalado, pero tiene versión %.250s.\n"
 
-#: main/depcon.c:230
+#: main/depcon.c:249
 #, c-format
 msgid "  %.250s is installed, but is version %.250s.\n"
 msgstr "  %.250s está instalado, pero tiene versión %.250s.\n"
 
-#: main/depcon.c:245
+#: main/depcon.c:264
 #, c-format
 msgid "  %.250s is unpacked, but has never been configured.\n"
 msgstr "  %.250s está desempaquetado, pero no ha sido configurado.\n"
 
-#: main/depcon.c:249
+#: main/depcon.c:268
 #, c-format
 msgid "  %.250s is unpacked, but is version %.250s.\n"
 msgstr "  %.250s está desempaquetado, pero tiene versión %.250s.\n"
 
-#: main/depcon.c:255
+#: main/depcon.c:274
 #, c-format
 msgid "  %.250s latest configured version is %.250s.\n"
 msgstr "  la última versión configurada de %.250s es la %.250s.\n"
 
-#: main/depcon.c:264
+#: main/depcon.c:283
 #, c-format
 msgid "  %.250s is %s.\n"
 msgstr "  %.250s es %s.\n"
 
-#: main/depcon.c:300
+#: main/depcon.c:319
 #, c-format
 msgid "  %.250s provides %.250s but is to be removed.\n"
 msgstr "  %.250s provee %.250s pero va a ser desinstalado.\n"
 
-#: main/depcon.c:304
+#: main/depcon.c:323
 #, c-format
 msgid "  %.250s provides %.250s but is to be deconfigured.\n"
 msgstr "  %.250s provee %.250s pero va a ser desconfigurado.\n"
 
-#: main/depcon.c:309
+#: main/depcon.c:328
 #, c-format
 msgid "  %.250s provides %.250s but is %s.\n"
 msgstr "  %.250s proporciona %.250s pero es %s.\n"
@@ -1631,28 +1627,28 @@ msgstr "  %.250s proporciona %.250s pero es %s.\n"
 #. If the package wasn't installed at all, and we haven't said
 #. * yet why this isn't satisfied, we should say so now.
 #.
-#: main/depcon.c:323
+#: main/depcon.c:342
 #, c-format
 msgid "  %.250s is not installed.\n"
 msgstr "  %.250s no está instalado.\n"
 
-#: main/depcon.c:354
+#: main/depcon.c:373
 #, c-format
 msgid "  %.250s (version %.250s) is to be installed.\n"
 msgstr "  %.250s (versión %.250s) va a ser instalado.\n"
 
-#: main/depcon.c:368
+#: main/depcon.c:387
 #, c-format
 msgid "  %.250s (version %.250s) is %s.\n"
 msgstr "  %.250s (versión %.250s) es %s.\n"
 
 #. conflicts and provides the same
-#: main/depcon.c:393
+#: main/depcon.c:412
 #, c-format
 msgid "  %.250s provides %.250s and is to be installed.\n"
 msgstr "  %.250s proporciona %.250s y va a ser instalado.\n"
 
-#: main/depcon.c:424
+#: main/depcon.c:443
 #, c-format
 msgid "  %.250s provides %.250s and is %s.\n"
 msgstr "  %.250s proporciona %.250s y es %s.\n"
@@ -2208,7 +2204,7 @@ msgstr " --license para ver el copyright y m
 # FUZZY.
 # FIXME: Extra space in Usage: line.
 #: main/main.c:58
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "Usage: \n"
 "  dpkg -i|--install      <.deb file name> ... | -R|--recursive <dir> ...\n"
@@ -2270,11 +2266,11 @@ msgid ""
 "  --abort-after <n>              Abort after encountering <n> errors\n"
 "\n"
 "Comparison operators for --compare-versions are:\n"
-" lt le eq ne ge gt       (treat no version as earlier than any version);\n"
-" lt-nl le-nl ge-nl gt-nl (treat no version as later than any version);\n"
+" lt le eq ne ge gt       (treat empty version as earlier than any version);\n"
+" lt-nl le-nl ge-nl gt-nl (treat empty version as later than any version);\n"
 " < << <= = >= >> >       (only for compatibility with control file syntax).\n"
 "\n"
-"Use `dselect' 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"
@@ -2393,7 +2389,7 @@ msgstr ""
 "Las opciones marcadas con ([*]) producen una salida extensa,\n"
 "¡fíltrela con `less' o con `more'!"
 
-#: main/main.c:185 main/query.c:506 dpkg-deb/main.c:157 split/main.c:144
+#: main/main.c:185 main/query.c:506 dpkg-deb/main.c:157 split/main.c:146
 #, c-format
 msgid "conflicting actions --%s and --%s"
 msgstr "acciones en conflicto --%s y --%s"
@@ -2598,7 +2594,7 @@ msgid "unexpected eof before end of line %d"
 msgstr "eof inesperado antes del fin de la línea %d"
 
 #: main/main.c:540 main/main.c:555 main/query.c:541 dpkg-deb/main.c:169
-#: split/main.c:157
+#: split/main.c:159
 msgid "need an action option"
 msgstr "se necesita una opción de acción"
 
@@ -2635,43 +2631,43 @@ msgstr ""
 "¡Se ha desempaquetado más de una copia del paquete %s!\n"
 " Se configurará solamente una vez.\n"
 
-#: main/packages.c:264 main/packages.c:308 main/packages.c:321
+#: main/packages.c:267 main/packages.c:311 main/packages.c:324
 msgid "  Package "
 msgstr "  el paquete "
 
-#: main/packages.c:267 main/packages.c:311 main/packages.c:324
+#: main/packages.c:270 main/packages.c:314 main/packages.c:327
 msgid " which provides "
 msgstr " que provee "
 
-#: main/packages.c:270
+#: main/packages.c:273
 msgid " is to be removed.\n"
 msgstr " va a ser desinstalado.\n"
 
-#: main/packages.c:282
+#: main/packages.c:285
 msgid "  Version of "
 msgstr "  Versión de "
 
-#: main/packages.c:284
+#: main/packages.c:287
 msgid " on system is "
 msgstr "  en el sistema es "
 
-#: main/packages.c:304
+#: main/packages.c:307
 #, c-format
 msgid "dpkg: also configuring `%s' (required by `%s')\n"
 msgstr "dpkg: también configurando `%s' (requerido por `%s')\n"
 
-#: main/packages.c:314
+#: main/packages.c:317
 msgid " is not configured yet.\n"
 msgstr " no está configurado todavía.\n"
 
-#: main/packages.c:327
+#: main/packages.c:330
 msgid " is not installed.\n"
 msgstr " no está instalado.\n"
 
 #. Don't print the line about the package to be removed if
 #. * that's the only line.
 #.
-#: main/packages.c:392
+#: main/packages.c:395
 msgid "; however:\n"
 msgstr "; sin embargo:\n"
 
@@ -3660,10 +3656,10 @@ msgid "archive has malformatted ctrl len `%s'"
 msgstr "el archivo tiene una longitud de control mal formada `%s'"
 
 #: dpkg-deb/extract.c:193
-#, c-format
+#, fuzzy, c-format
 msgid ""
 " old debian package, version %s.\n"
-" size %ld bytes: control archive= %ld, main archive= %zi.\n"
+" size %ld bytes: control archive= %zi, main archive= %ld.\n"
 msgstr ""
 " paquete debian antiguo, versión %s.\n"
 " tamaño %ld bytes: archivo de control= %ld, archivo principal= %zi.\n"
@@ -4083,7 +4079,7 @@ msgid "file `%.250s' is not an archive part"
 msgstr "el fichero `%.250s' no es una parte de archivo"
 
 #: split/info.c:188
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "%s:\n"
 "    Part format version:            %s\n"
@@ -4093,9 +4089,9 @@ msgid ""
 "        ... length:                 %lu bytes\n"
 "        ... split every:            %lu bytes\n"
 "    Part number:                    %d/%d\n"
-"    Part length:                    %lu bytes\n"
+"    Part length:                    %zi bytes\n"
 "    Part offset:                    %lu bytes\n"
-"    Part file size (used portion):  %zi bytes\n"
+"    Part file size (used portion):  %lu bytes\n"
 "\n"
 msgstr ""
 "%s:\n"
@@ -4155,12 +4151,12 @@ msgstr "--join requiere uno o m
 msgid "part %d is missing"
 msgstr "falta la parte %d"
 
-#: split/main.c:38
+#: split/main.c:40
 msgid "Debian GNU/Linux `dpkg-split' package split/join tool; version "
 msgstr ""
 "herramienta de división/unión `dpkg-split' de Debian GNU/Linux; versión "
 
-#: split/main.c:40
+#: split/main.c:42
 msgid ""
 "Copyright (C) 1994-1996 Ian Jackson.  This is free software; see the\n"
 "GNU General Public Licence version 2 or later for copying conditions.\n"
@@ -4171,7 +4167,7 @@ msgstr ""
 "de copia. No hay NINGUNA garantía. Vea dpkg-split --licence para más "
 "detalles.\n"
 
-#: split/main.c:47
+#: split/main.c:49
 #, c-format
 msgid ""
 "Usage: dpkg-split -s|--split <file> [<prefix>]     Split an archive.\n"
@@ -4218,30 +4214,30 @@ msgstr ""
 "\n"
 "Estado de salida: 0 = OK;  1 = -a no es una parte;  2 = ¡problemas!\n"
 
-#: split/main.c:68
+#: split/main.c:70
 msgid "Type dpkg-split --help for help."
 msgstr "Escriba dpkg-split --help para obtener ayuda."
 
-#: split/main.c:78
+#: split/main.c:80
 #, c-format
 msgid "error reading %s"
 msgstr "error al leer %s"
 
-#: split/main.c:82
+#: split/main.c:84
 #, c-format
 msgid "error reading %.250s"
 msgstr "error al leer %.250s"
 
-#: split/main.c:83
+#: split/main.c:85
 #, c-format
 msgid "unexpected end of file in %.250s"
 msgstr "fin de fichero inesperado en %.250s"
 
-#: split/main.c:103
+#: split/main.c:105
 msgid "part size is far too large or is not positive"
 msgstr "el tamaño de la parte es demasiado grande o no es positivo"
 
-#: split/main.c:107
+#: split/main.c:109
 #, c-format
 msgid "part size must be at least %dk (to allow for header)"
 msgstr ""
@@ -4417,37 +4413,37 @@ msgstr "ficheromd"
 msgid "%s: unrecognized line\n"
 msgstr "%s: línea no reconocida\n"
 
-#: utils/md5sum.c:284
+#: utils/md5sum.c:292
 #, c-format
 msgid "%s: can't open %s\n"
 msgstr "%s: no se puede abrir %s\n"
 
-#: utils/md5sum.c:288
+#: utils/md5sum.c:296
 #, c-format
 msgid "%s: error reading %s\n"
 msgstr "%s: error al leer %s\n"
 
-#: utils/md5sum.c:294
+#: utils/md5sum.c:302
 #, c-format
 msgid "FAILED\n"
 msgstr "FALLÓ\n"
 
-#: utils/md5sum.c:296
+#: utils/md5sum.c:304
 #, c-format
 msgid "%s: MD5 check failed for '%s'\n"
 msgstr "%s: La comprobación MD5 falló para `%s'\n"
 
-#: utils/md5sum.c:299
+#: utils/md5sum.c:307
 #, c-format
 msgid "OK\n"
 msgstr "Correcto\n"
 
-#: utils/md5sum.c:303
+#: utils/md5sum.c:311
 #, c-format
 msgid "%s: %d of %d file(s) failed MD5 check\n"
 msgstr "%s: la comprobación MD5 falló en %d de %d fichero(s)\n"
 
-#: utils/md5sum.c:305
+#: utils/md5sum.c:313
 #, c-format
 msgid "%s: no files checked\n"
 msgstr "%s: no se ha comprobado ningún fichero\n"
@@ -5534,9 +5530,10 @@ msgid " verbose:v help:?"
 msgstr " literal:v ayuda:?"
 
 #: dselect/pkginfo.cc:82
+#, fuzzy
 msgid ""
 "The line you have highlighted represents many packages; if you ask to "
-"install, remove, hold, &c it you will affect all the packages which match "
+"install, remove, hold, etc. it you will affect all the packages which match "
 "the criterion shown.\n"
 "\n"
 "If you move the highlight to a line for a particular package you will see "
@@ -5696,9 +5693,10 @@ msgid "Keystrokes"
 msgstr "Pulsaciones"
 
 #: dselect/helpmsgs.cc:8
+#, fuzzy
 msgid ""
 "Motion keys: Next/Previous, Top/End, Up/Down, Backwards/Forwards:\n"
-"  n, Down-arrow, j      p, Up-arrow, k          move highlight\n"
+"  Down-arrow, j         Up-arrow, k             move highlight\n"
 "  N, Page-down, Space   P, Page-up, Backspace   scroll list by 1 page\n"
 "  ^n                    ^p                      scroll list by 1 line\n"
 "  t, Home               e, End                  jump to top/end of list\n"
@@ -5724,7 +5722,7 @@ msgid ""
 "   R     Revert to state before this list      ^l   redraw display\n"
 "   U     set all to sUggested state             /   search (Return to "
 "cancel)\n"
-"   D     set all to Directly requested state    \\   repeat last search\n"
+"   D     set all to Directly requested state  n, \\  repeat last search\n"
 msgstr ""
 "Teclas de movimiento: Re Pág/Av Pág, Inicio/Fin,\n"
 "                      Hacia adelante/hacia atrás:\n"
@@ -6172,6 +6170,9 @@ msgstr ""
 "  /              buscar (simplemente pulse Intro para cancelar)\n"
 "  \\              repetir la última búsqueda\n"
 
+#~ msgid "must be at least two characters"
+#~ msgstr "debe tener al menos dos caracteres"
+
 #~ msgid "no gcc-lib component"
 #~ msgstr "no hay componente gcc-lib"
 

po/fr.po

@@ -19,7 +19,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Debian dpkg 1.6.13\n"
-"POT-Creation-Date: 2004-04-25 18:54+0100\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2004-06-01 18:18-0300\n"
 "PO-Revision-Date: 2004-04-28 17:14+0100\n"
 "Last-Translator: Sam Hocevar <sam@zoy.org\n"
 "Language-Team: French <debian-l10n-french@lists.debian.org>\n"
@@ -110,18 +111,18 @@ msgstr "Erreur syst
 msgid "Signal no.%d"
 msgstr "Signal n° %d"
 
-#: lib/database.c:124
+#: lib/database.c:125
 #, c-format
 msgid "couldn't allocate memory for strdup in findpackage(%s)"
 msgstr ""
 "impossible d'allouer de la mémoire pour « strdup » dans findpackage(%s)"
 
-#: lib/database.c:194
+#: lib/database.c:195
 #, c-format
 msgid "size %7d occurs %5d times\n"
 msgstr "la taille %7d apparaît %5d fois\n"
 
-#: lib/database.c:195
+#: lib/database.c:196
 msgid "failed write during hashreport"
 msgstr "échec de l'écriture durant « hashreport »"
 
@@ -825,43 +826,39 @@ msgstr "ne doit pas
 msgid "must start with an alphanumeric"
 msgstr "doit commencer par un caractère alphanumérique"
 
-#: lib/parsehelp.c:115
-msgid "must be at least two characters"
-msgstr "doit être long d'au moins deux caractères"
-
-#: lib/parsehelp.c:124
+#: lib/parsehelp.c:123
 #, c-format
 msgid "character `%c' not allowed - only letters, digits and %s allowed"
 msgstr ""
 "caractère « %c » non autorisé - seuls les lettres, les chiffres et %s sont "
 "autorisés"
 
-#: lib/parsehelp.c:179
+#: lib/parsehelp.c:178
 msgid "<none>"
 msgstr "<néant>"
 
-#: lib/parsehelp.c:194
+#: lib/parsehelp.c:193
 msgid "version string is empty"
 msgstr "la chaîne de version est vide"
 
-#: lib/parsehelp.c:205
+#: lib/parsehelp.c:204
 msgid "version string has embedded spaces"
 msgstr "la chaîne de version contient des espaces"
 
-#: lib/parsehelp.c:210
+#: lib/parsehelp.c:209
 msgid "epoch in version is not number"
 msgstr "l'époque (epoch) dans la version n'est pas un nombre"
 
-#: lib/parsehelp.c:211
+#: lib/parsehelp.c:210
 msgid "nothing after colon in version number"
 msgstr "rien après les deux points (:) dans le numéro de la version"
 
-#: lib/parsehelp.c:233
+#: lib/parsehelp.c:232
 #, c-format
 msgid "missing %s"
 msgstr " %s manque"
 
-#: lib/parsehelp.c:237
+#: lib/parsehelp.c:236
 #, c-format
 msgid "empty value for %s"
 msgstr " %s de valeur nulle"
@@ -968,6 +965,7 @@ msgstr ""
 
 #. Now that we have verified everything its time to actually
 #. * build something. Lets start by making the ar-wrapper.
+#.
 #: main/archives.c:496 dpkg-deb/build.c:368
 #, c-format
 msgid "unable to create `%.255s'"
@@ -1434,6 +1432,7 @@ msgstr "l'attente de l'interpr
 
 #. Do not job control to suspend but fork and start a new shell
 #. * instead.
+#.
 #. waitpid status
 #. waitpid result
 #: main/configure.c:489
@@ -1581,114 +1580,115 @@ msgstr "erreur de lecture sur l'entr
 msgid "EOF on stdin at conffile prompt"
 msgstr "EOF sur l'entrée standard à l'invite de configuration"
 
-#: main/depcon.c:74
+#: main/depcon.c:76
 #, c-format
 msgid "unable to check for existence of `%.250s'"
 msgstr "impossible de vérifier l'existence de « %.250s »"
 
-#: main/depcon.c:134 main/packages.c:386
+#: main/depcon.c:153 main/packages.c:389
 msgid " depends on "
 msgstr " dépend de "
 
-#: main/depcon.c:135
+#: main/depcon.c:154
 msgid " pre-depends on "
 msgstr " pré-dépend de "
 
-#: main/depcon.c:136
+#: main/depcon.c:155
 msgid " recommends "
 msgstr " recommande "
 
-#: main/depcon.c:137
+#: main/depcon.c:156
 msgid " conflicts with "
 msgstr " entre en conflit avec "
 
-#: main/depcon.c:138
+#: main/depcon.c:157
 msgid " suggests "
 msgstr "suggère "
 
-#: main/depcon.c:139
+#: main/depcon.c:158
 msgid " enhances "
 msgstr " étend "
 
-#: main/depcon.c:215
+#: main/depcon.c:234
 #, c-format
 msgid "  %.250s is to be removed.\n"
 msgstr "  %.250s doit être supprimé.\n"
 
-#: main/depcon.c:218
+#: main/depcon.c:237
 #, c-format
 msgid "  %.250s is to be deconfigured.\n"
 msgstr "  %.250s doit être déconfiguré.\n"
 
-#: main/depcon.c:222
+#: main/depcon.c:241
 #, c-format
 msgid "  %.250s is to be installed, but is version %.250s.\n"
 msgstr "  %.250s doit être installé, mais sa version est %.250s.\n"
 
-#: main/depcon.c:230
+#: main/depcon.c:249
 #, c-format
 msgid "  %.250s is installed, but is version %.250s.\n"
 msgstr "  %.250s est installé, mais sa version est %.250s.\n"
 
-#: main/depcon.c:245
+#: main/depcon.c:264
 #, c-format
 msgid "  %.250s is unpacked, but has never been configured.\n"
 msgstr "  %.250s est dépaqueté, mais n'a jamais été configuré.\n"
 
-#: main/depcon.c:249
+#: main/depcon.c:268
 #, c-format
 msgid "  %.250s is unpacked, but is version %.250s.\n"
 msgstr "  %.250s est dépaqueté, mais sa version est %.250s.\n"
 
-#: main/depcon.c:255
+#: main/depcon.c:274
 #, c-format
 msgid "  %.250s latest configured version is %.250s.\n"
 msgstr "  la dernière version configurée de %.250s est %.250s.\n"
 
-#: main/depcon.c:264
+#: main/depcon.c:283
 #, c-format
 msgid "  %.250s is %s.\n"
 msgstr "  %.250s est %s.\n"
 
-#: main/depcon.c:300
+#: main/depcon.c:319
 #, c-format
 msgid "  %.250s provides %.250s but is to be removed.\n"
 msgstr "  %.250s fournit %.250s mais doit être supprimé.\n"
 
-#: main/depcon.c:304
+#: main/depcon.c:323
 #, c-format
 msgid "  %.250s provides %.250s but is to be deconfigured.\n"
 msgstr "  %.250s fournit %.250s mais doit être déconfiguré.\n"
 
-#: main/depcon.c:309
+#: main/depcon.c:328
 #, c-format
 msgid "  %.250s provides %.250s but is %s.\n"
 msgstr "  %.250s fournit %.250s mais est %s.\n"
 
 #. If the package wasn't installed at all, and we haven't said
 #. * yet why this isn't satisfied, we should say so now.
-#: main/depcon.c:323
+#.
+#: main/depcon.c:342
 #, c-format
 msgid "  %.250s is not installed.\n"
 msgstr "  %.250s n'est pas installé.\n"
 
-#: main/depcon.c:354
+#: main/depcon.c:373
 #, c-format
 msgid "  %.250s (version %.250s) is to be installed.\n"
 msgstr "  %.250s (version %.250s) doit être installé.\n"
 
-#: main/depcon.c:368
+#: main/depcon.c:387
 #, c-format
 msgid "  %.250s (version %.250s) is %s.\n"
 msgstr "  %.250s (version %.250s) est %s.\n"
 
 #. conflicts and provides the same
-#: main/depcon.c:393
+#: main/depcon.c:412
 #, c-format
 msgid "  %.250s provides %.250s and is to be installed.\n"
 msgstr "  %.250s fournit %.250s et doit être installé.\n"
 
-#: main/depcon.c:424
+#: main/depcon.c:443
 #, c-format
 msgid "  %.250s provides %.250s and is %s.\n"
 msgstr "  %.250s fournit %.250s et est %s.\n"
@@ -2237,7 +2237,7 @@ msgid " --licence for copyright and license details.\n"
 msgstr " --licence pour plus de détails sur le copyright et la licence.\n"
 
 #: main/main.c:58
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "Usage: \n"
 "  dpkg -i|--install      <.deb file name> ... | -R|--recursive <dir> ...\n"
@@ -2299,11 +2299,11 @@ msgid ""
 "  --abort-after <n>              Abort after encountering <n> errors\n"
 "\n"
 "Comparison operators for --compare-versions are:\n"
-" lt le eq ne ge gt       (treat no version as earlier than any version);\n"
-" lt-nl le-nl ge-nl gt-nl (treat no version as later than any version);\n"
+" lt le eq ne ge gt       (treat empty version as earlier than any version);\n"
+" lt-nl le-nl ge-nl gt-nl (treat empty version as later than any version);\n"
 " < << <= = >= >> >       (only for compatibility with control file syntax).\n"
 "\n"
-"Use `dselect' 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"
@@ -2423,7 +2423,7 @@ msgstr ""
 "Les options marquées d'un [*] affichent beaucoup d'informations - tubez-les "
 "à travers « less » ou « more » !"
 
-#: main/main.c:185 main/query.c:506 dpkg-deb/main.c:157 split/main.c:144
+#: main/main.c:185 main/query.c:506 dpkg-deb/main.c:157 split/main.c:146
 #, c-format
 msgid "conflicting actions --%s and --%s"
 msgstr "actions conflictuelles --%s et --%s"
@@ -2631,7 +2631,7 @@ msgid "unexpected eof before end of line %d"
 msgstr "EOF inattendu avant la fin de la ligne %d"
 
 #: main/main.c:540 main/main.c:555 main/query.c:541 dpkg-deb/main.c:169
-#: split/main.c:157
+#: split/main.c:159
 msgid "need an action option"
 msgstr "requiert une option d'action"
 
@@ -2667,42 +2667,43 @@ msgstr ""
 "Plus d'une copie du paquet %s ont été dépaquetées\n"
 " lors de ce traitement ! Une seule configuration effectuée.\n"
 
-#: main/packages.c:264 main/packages.c:308 main/packages.c:321
+#: main/packages.c:267 main/packages.c:311 main/packages.c:324
 msgid "  Package "
 msgstr "  Paquet "
 
-#: main/packages.c:267 main/packages.c:311 main/packages.c:324
+#: main/packages.c:270 main/packages.c:314 main/packages.c:327
 msgid " which provides "
 msgstr " qui fournit "
 
-#: main/packages.c:270
+#: main/packages.c:273
 msgid " is to be removed.\n"
 msgstr " doit être supprimé.\n"
 
-#: main/packages.c:282
+#: main/packages.c:285
 msgid "  Version of "
 msgstr "  La version de "
 
-#: main/packages.c:284
+#: main/packages.c:287
 msgid " on system is "
 msgstr " sur le système est "
 
-#: main/packages.c:304
+#: main/packages.c:307
 #, c-format
 msgid "dpkg: also configuring `%s' (required by `%s')\n"
 msgstr "dpkg : configuration additionnelle de « %s » (requise par « %s »)\n"
 
-#: main/packages.c:314
+#: main/packages.c:317
 msgid " is not configured yet.\n"
 msgstr " n'est pas encore configuré.\n"
 
-#: main/packages.c:327
+#: main/packages.c:330
 msgid " is not installed.\n"
 msgstr " n'est pas installé.\n"
 
 #. Don't print the line about the package to be removed if
 #. * that's the only line.
-#: main/packages.c:392
+#.
+#: main/packages.c:395
 msgid "; however:\n"
 msgstr " ; cependant :\n"
 
@@ -3515,6 +3516,7 @@ msgstr "impossible d'ex
 
 #. Create a temporary file to store the control data in. Immediately unlink
 #. * our temporary file so others can't mess with it.
+#.
 #: dpkg-deb/build.c:382
 msgid "failed to make tmpfile (control)"
 msgstr "impossible de créer un fichier temporaire (« control »)"
@@ -3658,6 +3660,7 @@ msgstr ""
 
 #. Members with `_' are noncritical, and if we don't understand them
 #. * we skip them.
+#.
 #: dpkg-deb/extract.c:150 dpkg-deb/extract.c:168
 #, c-format
 msgid "skipped member data from %s"
@@ -3694,10 +3697,10 @@ msgid "archive has malformatted ctrl len `%s'"
 msgstr "l'archive possède une information de contrôle « %s » mal formée"
 
 #: dpkg-deb/extract.c:193
-#, c-format
+#, fuzzy, c-format
 msgid ""
 " old debian package, version %s.\n"
-" size %ld bytes: control archive= %ld, main archive= %zi.\n"
+" size %ld bytes: control archive= %zi, main archive= %ld.\n"
 msgstr ""
 " ancien paquet Debian, version %s.\n"
 " taille %ld octets : archive de contrôle= %ld, archive principale= %zi.\n"
@@ -4122,7 +4125,7 @@ msgid "file `%.250s' is not an archive part"
 msgstr "le fichier « %.250s » n'est pas une partie de l'archive"
 
 #: split/info.c:188
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "%s:\n"
 "    Part format version:            %s\n"
@@ -4132,9 +4135,9 @@ msgid ""
 "        ... length:                 %lu bytes\n"
 "        ... split every:            %lu bytes\n"
 "    Part number:                    %d/%d\n"
-"    Part length:                    %lu bytes\n"
+"    Part length:                    %zi bytes\n"
 "    Part offset:                    %lu bytes\n"
-"    Part file size (used portion):  %zi bytes\n"
+"    Part file size (used portion):  %lu bytes\n"
 "\n"
 msgstr ""
 "%s :\n"
@@ -4195,13 +4198,13 @@ msgstr "--join requiert un ou plusieurs fichiers comme arguments"
 msgid "part %d is missing"
 msgstr "la partie %d est manquante"
 
-#: split/main.c:38
+#: split/main.c:40
 msgid "Debian GNU/Linux `dpkg-split' package split/join tool; version "
 msgstr ""
 "Debian GNU-Linux « dpkg-split » outil de (dés)assemblage de paquets ; "
 "version "
 
-#: split/main.c:40
+#: split/main.c:42
 msgid ""
 "Copyright (C) 1994-1996 Ian Jackson.  This is free software; see the\n"
 "GNU General Public Licence version 2 or later for copying conditions.\n"
@@ -4214,7 +4217,7 @@ msgstr ""
 "invités à consulter dpkg-deb --licence pour prendre connaissance\n"
 "des détails ayant trait à la licence.\n"
 
-#: split/main.c:47
+#: split/main.c:49
 #, c-format
 msgid ""
 "Usage: dpkg-split -s|--split <file> [<prefix>]     Split an archive.\n"
@@ -4265,30 +4268,30 @@ msgstr ""
 "\n"
 "Code de sortie : 0 = OK ;  1 = -a n'est pas une partie ;  2 = problème !\n"
 
-#: split/main.c:68
+#: split/main.c:70
 msgid "Type dpkg-split --help for help."
 msgstr "Taper dpkg-split --help pour obtenir de l'aide."
 
-#: split/main.c:78
+#: split/main.c:80
 #, c-format
 msgid "error reading %s"
 msgstr "erreur de lecture sur %s"
 
-#: split/main.c:82
+#: split/main.c:84
 #, c-format
 msgid "error reading %.250s"
 msgstr "erreur de lecture sur %.250s"
 
-#: split/main.c:83
+#: split/main.c:85
 #, c-format
 msgid "unexpected end of file in %.250s"
 msgstr "fin de fichier inattendue dans %.250s"
 
-#: split/main.c:103
+#: split/main.c:105
 msgid "part size is far too large or is not positive"
 msgstr "taille de partie beaucoup trop grande ou négative"
 
-#: split/main.c:107
+#: split/main.c:109
 #, c-format
 msgid "part size must be at least %dk (to allow for header)"
 msgstr ""
@@ -4461,42 +4464,43 @@ msgstr "mdfile"
 
 #. Don't print the buffer; we might be dealing with a
 #. * non-text file.
+#.
 #: utils/md5sum.c:250
 #, c-format
 msgid "%s: unrecognized line\n"
 msgstr "%s : ligne non reconnue\n"
 
-#: utils/md5sum.c:284
+#: utils/md5sum.c:292
 #, c-format
 msgid "%s: can't open %s\n"
 msgstr "%s : ne peut pas ouvrir %s\n"
 
-#: utils/md5sum.c:288
+#: utils/md5sum.c:296
 #, c-format
 msgid "%s: error reading %s\n"
 msgstr "%s : erreur de lecture sur %s\n"
 
-#: utils/md5sum.c:294
+#: utils/md5sum.c:302
 #, c-format
 msgid "FAILED\n"
 msgstr "ÉCHEC\n"
 
-#: utils/md5sum.c:296
+#: utils/md5sum.c:304
 #, c-format
 msgid "%s: MD5 check failed for '%s'\n"
 msgstr "%s : échec de la vérification MD5 pour « %s »\n"
 
-#: utils/md5sum.c:299
+#: utils/md5sum.c:307
 #, c-format
 msgid "OK\n"
 msgstr "OK\n"
 
-#: utils/md5sum.c:303
+#: utils/md5sum.c:311
 #, c-format
 msgid "%s: %d of %d file(s) failed MD5 check\n"
 msgstr "%s : échec de la vérification MD5 pour %d sur %d fichier(s)\n"
 
-#: utils/md5sum.c:305
+#: utils/md5sum.c:313
 #, c-format
 msgid "%s: no files checked\n"
 msgstr "%s : aucun fichier vérifié\n"
@@ -5317,6 +5321,7 @@ msgstr "purger"
 #. WTA: the space is a trick to work around gettext which uses the empty
 #. * string to store information about the translation. DO NOT CHANGE
 #. * THAT IN A TRANSLATION! The code really relies on that being a single space.
+#.
 #: dselect/pkgdisplay.cc:48
 msgid " "
 msgstr " "
@@ -5586,9 +5591,10 @@ msgid " verbose:v help:?"
 msgstr " verbeux:v aide:?"
 
 #: dselect/pkginfo.cc:82
+#, fuzzy
 msgid ""
 "The line you have highlighted represents many packages; if you ask to "
-"install, remove, hold, &c it you will affect all the packages which match "
+"install, remove, hold, etc. it you will affect all the packages which match "
 "the criterion shown.\n"
 "\n"
 "If you move the highlight to a line for a particular package you will see "
@@ -5745,9 +5751,10 @@ msgid "Keystrokes"
 msgstr "Combinaisons de touches"
 
 #: dselect/helpmsgs.cc:8
+#, fuzzy
 msgid ""
 "Motion keys: Next/Previous, Top/End, Up/Down, Backwards/Forwards:\n"
-"  n, Down-arrow, j      p, Up-arrow, k          move highlight\n"
+"  Down-arrow, j         Up-arrow, k             move highlight\n"
 "  N, Page-down, Space   P, Page-up, Backspace   scroll list by 1 page\n"
 "  ^n                    ^p                      scroll list by 1 line\n"
 "  t, Home               e, End                  jump to top/end of list\n"
@@ -5773,7 +5780,7 @@ msgid ""
 "   R     Revert to state before this list      ^l   redraw display\n"
 "   U     set all to sUggested state             /   search (Return to "
 "cancel)\n"
-"   D     set all to Directly requested state    \\   repeat last search\n"
+"   D     set all to Directly requested state  n, \\  repeat last search\n"
 msgstr ""
 "Touches de déplacement : Suivant/Précédent, Début/Fin, Haut/Bas, Arrière/"
 "Avant :\n"
@@ -6215,3 +6222,6 @@ msgstr ""
 " ^l               redessiner l'affichage\n"
 "  /               rechercher (appuyer sur entrée pour annuler)\n"
 "  \\               répéter la dernière recherche\n"
+
+#~ msgid "must be at least two characters"
+#~ msgstr "doit être long d'au moins deux caractères"

po/gl.po

@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dpkg 1.9.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-04-25 18:54+0100\n"
+"POT-Creation-Date: 2004-06-01 18:18-0300\n"
 "PO-Revision-Date: 2002-05-28 02:13+0200\n"
 "Last-Translator: Alberto García <berto@gpul.org>\n"
 "Language-Team: Galician <gpul-traduccion@ceu.fi.udc.es>\n"
@@ -56,18 +56,18 @@ msgstr "Erro de sistema no.%d"
 msgid "Signal no.%d"
 msgstr "Sinal no.%d"
 
-#: lib/database.c:124
+#: lib/database.c:125
 #, c-format
 msgid "couldn't allocate memory for strdup in findpackage(%s)"
 msgstr "non se puido reservar memoria para strdup en findpackage(%s)"
 
-#: lib/database.c:194
+#: lib/database.c:195
 #, c-format
 msgid "size %7d occurs %5d times\n"
 msgstr "o tamaño %7d aparece %5d veces\n"
 
 #  Descoñezo se hai algunha traducción adecuada para `hashreport'
-#: lib/database.c:195
+#: lib/database.c:196
 msgid "failed write during hashreport"
 msgstr "erro na escritura durante `hashreport'"
 
@@ -762,43 +762,39 @@ msgstr "non pode ser a cadea vac
 msgid "must start with an alphanumeric"
 msgstr "debe comezar cun alfanumérico"
 
-#: lib/parsehelp.c:115
-msgid "must be at least two characters"
-msgstr "debe ser polo menos dous caracteres"
-
-#: lib/parsehelp.c:124
+#: lib/parsehelp.c:123
 #, c-format
 msgid "character `%c' not allowed - only letters, digits and %s allowed"
 msgstr ""
 "o caracter `%c' non está permitido - só se permiten letras, díxitos e %s"
 
 #  Esto sae cando non hai versións dispoñibles, por tanto é feminino
-#: lib/parsehelp.c:179
+#: lib/parsehelp.c:178
 msgid "<none>"
 msgstr "<ningunha>"
 
-#: lib/parsehelp.c:194
+#: lib/parsehelp.c:193
 msgid "version string is empty"
 msgstr "a cadea de versión está baleira"
 
-#: lib/parsehelp.c:205
+#: lib/parsehelp.c:204
 msgid "version string has embedded spaces"
 msgstr "a cadea de versión ten espacios insertados"
 
-#: lib/parsehelp.c:210
+#: lib/parsehelp.c:209
 msgid "epoch in version is not number"
 msgstr "a época na versión non é un número"
 
-#: lib/parsehelp.c:211
+#: lib/parsehelp.c:210
 msgid "nothing after colon in version number"
 msgstr "non hai nada tras os dous puntos no número de versión"
 
-#: lib/parsehelp.c:233
+#: lib/parsehelp.c:232
 #, c-format
 msgid "missing %s"
 msgstr "falta %s"
 
-#: lib/parsehelp.c:237
+#: lib/parsehelp.c:236
 #, c-format
 msgid "empty value for %s"
 msgstr "valor baleiro para %s"
@@ -1493,86 +1489,86 @@ msgstr "erro de lectura na entrada est
 msgid "EOF on stdin at conffile prompt"
 msgstr "EOF na entrada estándar ó preguntar sobre os conffiles"
 
-#: main/depcon.c:74
+#: main/depcon.c:76
 #, c-format
 msgid "unable to check for existence of `%.250s'"
 msgstr "non se puido comprobar a existencia de `%.250s'"
 
-#: main/depcon.c:134 main/packages.c:386
+#: main/depcon.c:153 main/packages.c:389
 msgid " depends on "
 msgstr " depende de "
 
-#: main/depcon.c:135
+#: main/depcon.c:154
 msgid " pre-depends on "
 msgstr " pre-depende de "
 
-#: main/depcon.c:136
+#: main/depcon.c:155
 msgid " recommends "
 msgstr " recomenda "
 
-#: main/depcon.c:137
+#: main/depcon.c:156
 msgid " conflicts with "
 msgstr " fai conflicto con "
 
-#: main/depcon.c:138
+#: main/depcon.c:157
 msgid " suggests "
 msgstr " suxire "
 
-#: main/depcon.c:139
+#: main/depcon.c:158
 msgid " enhances "
 msgstr " mellora "
 
-#: main/depcon.c:215
+#: main/depcon.c:234
 #, c-format
 msgid "  %.250s is to be removed.\n"
 msgstr "  %.250s vai ser desinstalado.\n"
 
-#: main/depcon.c:218
+#: main/depcon.c:237
 #, c-format
 msgid "  %.250s is to be deconfigured.\n"
 msgstr "  %.250s vai ser desconfigurado.\n"
 
-#: main/depcon.c:222
+#: main/depcon.c:241
 #, c-format
 msgid "  %.250s is to be installed, but is version %.250s.\n"
 msgstr "  %.250s vai ser instalado, pero ten a versión %.250s.\n"
 
-#: main/depcon.c:230
+#: main/depcon.c:249
 #, c-format
 msgid "  %.250s is installed, but is version %.250s.\n"
 msgstr "  %.250s está instalado, pero ten a versión %.250s.\n"
 
-#: main/depcon.c:245
+#: main/depcon.c:264
 #, c-format
 msgid "  %.250s is unpacked, but has never been configured.\n"
 msgstr "  %.250s está desempaquetado, pero nunca foi configurado.\n"
 
-#: main/depcon.c:249
+#: main/depcon.c:268
 #, c-format
 msgid "  %.250s is unpacked, but is version %.250s.\n"
 msgstr "  %.250s está desempaquetado, pero ten a versión %.250s.\n"
 
-#: main/depcon.c:255
+#: main/depcon.c:274
 #, c-format
 msgid "  %.250s latest configured version is %.250s.\n"
 msgstr "  a versión máis recente configurada de %.250s é a %.250s.\n"
 
-#: main/depcon.c:264
+#: main/depcon.c:283
 #, c-format
 msgid "  %.250s is %s.\n"
 msgstr "  %.250s é %s.\n"
 
-#: main/depcon.c:300
+#: main/depcon.c:319
 #, c-format
 msgid "  %.250s provides %.250s but is to be removed.\n"
 msgstr "  %.250s proporciona %.250s pero vai ser desinstalado.\n"
 
-#: main/depcon.c:304
+#: main/depcon.c:323
 #, c-format
 msgid "  %.250s provides %.250s but is to be deconfigured.\n"
 msgstr "  %.250s proporciona %.250s pero vai ser desconfigurado.\n"
 
-#: main/depcon.c:309
+#: main/depcon.c:328
 #, c-format
 msgid "  %.250s provides %.250s but is %s.\n"
 msgstr "  %.250s proporciona %.250s pero é %s.\n"
@@ -1580,28 +1576,28 @@ msgstr "  %.250s proporciona %.250s pero
 #. If the package wasn't installed at all, and we haven't said
 #. * yet why this isn't satisfied, we should say so now.
 #.
-#: main/depcon.c:323
+#: main/depcon.c:342
 #, c-format
 msgid "  %.250s is not installed.\n"
 msgstr "  %.250s non está instalado.\n"
 
-#: main/depcon.c:354
+#: main/depcon.c:373
 #, c-format
 msgid "  %.250s (version %.250s) is to be installed.\n"
 msgstr "  %.250s (versión %.250s) vai ser instalado.\n"
 
-#: main/depcon.c:368
+#: main/depcon.c:387
 #, c-format
 msgid "  %.250s (version %.250s) is %s.\n"
 msgstr "  %.250s (versión %.250s) é %s.\n"
 
 #. conflicts and provides the same
-#: main/depcon.c:393
+#: main/depcon.c:412
 #, c-format
 msgid "  %.250s provides %.250s and is to be installed.\n"
 msgstr "   %.250s proporciona %.250s e vai ser instalado.\n"
 
-#: main/depcon.c:424
+#: main/depcon.c:443
 #, c-format
 msgid "  %.250s provides %.250s and is %s.\n"
 msgstr "  %.250s proporciona %.250s e é %s.\n"
@@ -2190,11 +2186,11 @@ msgid ""
 "  --abort-after <n>              Abort after encountering <n> errors\n"
 "\n"
 "Comparison operators for --compare-versions are:\n"
-" lt le eq ne ge gt       (treat no version as earlier than any version);\n"
-" lt-nl le-nl ge-nl gt-nl (treat no version as later than any version);\n"
+" lt le eq ne ge gt       (treat empty version as earlier than any version);\n"
+" lt-nl le-nl ge-nl gt-nl (treat empty version as later than any version);\n"
 " < << <= = >= >> >       (only for compatibility with control file syntax).\n"
 "\n"
-"Use `dselect' 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"
@@ -2306,7 +2302,7 @@ msgstr ""
 "As opcións marcadas con [*] producen unha saída extensa - ¡ fíltrea con\n"
 "`less' ou `more' !"
 
-#: main/main.c:185 main/query.c:506 dpkg-deb/main.c:157 split/main.c:144
+#: main/main.c:185 main/query.c:506 dpkg-deb/main.c:157 split/main.c:146
 #, c-format
 msgid "conflicting actions --%s and --%s"
 msgstr "as accións --%s e --%s están en conflicto"
@@ -2495,7 +2491,7 @@ msgid "unexpected eof before end of line %d"
 msgstr "eof inesperado antes do fin da liña %d"
 
 #: main/main.c:540 main/main.c:555 main/query.c:541 dpkg-deb/main.c:169
-#: split/main.c:157
+#: split/main.c:159
 msgid "need an action option"
 msgstr "é necesaria unha opción de acción"
 
@@ -2531,43 +2527,43 @@ msgstr ""
 "¡ Desempaquetouse máis dunha copia do paquete %s nesta execución !\n"
 " Só se configurará unha vez.\n"
 
-#: main/packages.c:264 main/packages.c:308 main/packages.c:321
+#: main/packages.c:267 main/packages.c:311 main/packages.c:324
 msgid "  Package "
 msgstr "  O paquete "
 
-#: main/packages.c:267 main/packages.c:311 main/packages.c:324
+#: main/packages.c:270 main/packages.c:314 main/packages.c:327
 msgid " which provides "
 msgstr " que proporciona "
 
-#: main/packages.c:270
+#: main/packages.c:273
 msgid " is to be removed.\n"
 msgstr " vai ser desinstalado.\n"
 
-#: main/packages.c:282
+#: main/packages.c:285
 msgid "  Version of "
 msgstr "  A versión de "
 
-#: main/packages.c:284
+#: main/packages.c:287
 msgid " on system is "
 msgstr " no sistema é "
 
-#: main/packages.c:304
+#: main/packages.c:307
 #, c-format
 msgid "dpkg: also configuring `%s' (required by `%s')\n"
 msgstr "dpkg: tamén se configurará `%s' (requerido por `%s')\n"
 
-#: main/packages.c:314
+#: main/packages.c:317
 msgid " is not configured yet.\n"
 msgstr " non está configurado aínda.\n"
 
-#: main/packages.c:327
+#: main/packages.c:330
 msgid " is not installed.\n"
 msgstr " non está instalado.\n"
 
 #. Don't print the line about the package to be removed if
 #. * that's the only line.
 #.
-#: main/packages.c:392
+#: main/packages.c:395
 msgid "; however:\n"
 msgstr "; nembargantes:\n"
 
@@ -3513,10 +3509,10 @@ msgid "archive has malformatted ctrl len `%s'"
 msgstr "o arquivo ten unha lonxitude de control mal formateada `%s'"
 
 #: dpkg-deb/extract.c:193
-#, c-format
+#, fuzzy, c-format
 msgid ""
 " old debian package, version %s.\n"
-" size %ld bytes: control archive= %ld, main archive= %zi.\n"
+" size %ld bytes: control archive= %zi, main archive= %ld.\n"
 msgstr ""
 " paquete de debian antigo, versión %s.\n"
 " tamaño %ld bytes: arquivo de control= %ld, arquivo principal= %zi.\n"
@@ -3920,7 +3916,7 @@ msgid "file `%.250s' is not an archive part"
 msgstr "o ficheiro `%.250s' non é unha parte de arquivo"
 
 #: split/info.c:188
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "%s:\n"
 "    Part format version:            %s\n"
@@ -3930,9 +3926,9 @@ msgid ""
 "        ... length:                 %lu bytes\n"
 "        ... split every:            %lu bytes\n"
 "    Part number:                    %d/%d\n"
-"    Part length:                    %lu bytes\n"
+"    Part length:                    %zi bytes\n"
 "    Part offset:                    %lu bytes\n"
-"    Part file size (used portion):  %zi bytes\n"
+"    Part file size (used portion):  %lu bytes\n"
 "\n"
 msgstr ""
 "%s:\n"
@@ -3992,13 +3988,13 @@ msgstr "--join require un ou m
 msgid "part %d is missing"
 msgstr "falta a parte %d"
 
-#: split/main.c:38
+#: split/main.c:40
 msgid "Debian GNU/Linux `dpkg-split' package split/join tool; version "
 msgstr ""
 "Ferramenta de división/unión de paquetes `dpkg-split' de Debian GNU/Linux; "
 "versión "
 
-#: split/main.c:40
+#: split/main.c:42
 msgid ""
 "Copyright (C) 1994-1996 Ian Jackson.  This is free software; see the\n"
 "GNU General Public Licence version 2 or later for copying conditions.\n"
@@ -4009,7 +4005,7 @@ msgstr ""
 "de copia. Non hai NINGUNHA garantía. Vexa dpkg-split --licence para máis\n"
 "detalles.\n"
 
-#: split/main.c:47
+#: split/main.c:49
 #, c-format
 msgid ""
 "Usage: dpkg-split -s|--split <file> [<prefix>]     Split an archive.\n"
@@ -4055,30 +4051,30 @@ msgstr ""
 "\n"
 "Estado de saída: 0 = OK;  1 = -a non é unha parte;  2 = ¡problemas!\n"
 
-#: split/main.c:68
+#: split/main.c:70
 msgid "Type dpkg-split --help for help."
 msgstr "Escriba dpkg-split --help para obter axuda."
 
-#: split/main.c:78
+#: split/main.c:80
 #, c-format
 msgid "error reading %s"
 msgstr "erro lendo %s"
 
-#: split/main.c:82
+#: split/main.c:84
 #, c-format
 msgid "error reading %.250s"
 msgstr "erro lendo %.250s"
 
-#: split/main.c:83
+#: split/main.c:85
 #, c-format
 msgid "unexpected end of file in %.250s"
 msgstr "fin de ficheiro inesperado en %.250s"
 
-#: split/main.c:103
+#: split/main.c:105
 msgid "part size is far too large or is not positive"
 msgstr "o tamaño da parte é demasiado longo ou non é positivo"
 
-#: split/main.c:107
+#: split/main.c:109
 #, c-format
 msgid "part size must be at least %dk (to allow for header)"
 msgstr ""
@@ -4254,37 +4250,37 @@ msgstr "mdfile"
 msgid "%s: unrecognized line\n"
 msgstr "%s: liña non recoñecida: %s"
 
-#: utils/md5sum.c:284
+#: utils/md5sum.c:292
 #, c-format
 msgid "%s: can't open %s\n"
 msgstr "%s: non se pode abrir %s\n"
 
-#: utils/md5sum.c:288
+#: utils/md5sum.c:296
 #, c-format
 msgid "%s: error reading %s\n"
 msgstr "%s: erro lendo %s\n"
 
-#: utils/md5sum.c:294
+#: utils/md5sum.c:302
 #, c-format
 msgid "FAILED\n"
 msgstr "FALLOU\n"
 
-#: utils/md5sum.c:296
+#: utils/md5sum.c:304
 #, c-format
 msgid "%s: MD5 check failed for '%s'\n"
 msgstr "%s: fallou o chequeo MD5 para '%s'\n"
 
-#: utils/md5sum.c:299
+#: utils/md5sum.c:307
 #, c-format
 msgid "OK\n"
 msgstr "OK\n"
 
-#: utils/md5sum.c:303
+#: utils/md5sum.c:311
 #, c-format
 msgid "%s: %d of %d file(s) failed MD5 check\n"
 msgstr "%s: a comprobación MD5 fallou en %d ficheiro(s) de %d\n"
 
-#: utils/md5sum.c:305
+#: utils/md5sum.c:313
 #, c-format
 msgid "%s: no files checked\n"
 msgstr "%s: non se comprobou ningún ficheiro\n"
@@ -5360,9 +5356,10 @@ msgid " verbose:v help:?"
 msgstr " literal:v axuda:?"
 
 #: dselect/pkginfo.cc:82
+#, fuzzy
 msgid ""
 "The line you have highlighted represents many packages; if you ask to "
-"install, remove, hold, &c it you will affect all the packages which match "
+"install, remove, hold, etc. it you will affect all the packages which match "
 "the criterion shown.\n"
 "\n"
 "If you move the highlight to a line for a particular package you will see "
@@ -5521,9 +5518,10 @@ msgid "Keystrokes"
 msgstr "Pulsacións"
 
 #: dselect/helpmsgs.cc:8
+#, fuzzy
 msgid ""
 "Motion keys: Next/Previous, Top/End, Up/Down, Backwards/Forwards:\n"
-"  n, Down-arrow, j      p, Up-arrow, k          move highlight\n"
+"  Down-arrow, j         Up-arrow, k             move highlight\n"
 "  N, Page-down, Space   P, Page-up, Backspace   scroll list by 1 page\n"
 "  ^n                    ^p                      scroll list by 1 line\n"
 "  t, Home               e, End                  jump to top/end of list\n"
@@ -5549,7 +5547,7 @@ msgid ""
 "   R     Revert to state before this list      ^l   redraw display\n"
 "   U     set all to sUggested state             /   search (Return to "
 "cancel)\n"
-"   D     set all to Directly requested state    \\   repeat last search\n"
+"   D     set all to Directly requested state  n, \\  repeat last search\n"
 msgstr ""
 "Teclas de movemento: Re Páx/Av Páx, Inicio/Fin, Arriba/Abaixo, Adiante/"
 "Atrás:\n"
@@ -5995,6 +5993,9 @@ msgstr ""
 "  /                buscar (pulse intro para cancelar)\n"
 "  \\                repetir a última búsqueda\n"
 
+#~ msgid "must be at least two characters"
+#~ msgstr "debe ser polo menos dous caracteres"
+
 #~ msgid ""
 #~ "Your currently installed version of the file is in:\n"
 #~ " %s\n"

po/ja.po

@@ -18,7 +18,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 1.6.7\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-04-25 18:54+0100\n"
+"POT-Creation-Date: 2004-06-01 18:18-0300\n"
 "PO-Revision-Date: 2003-09-16 02:31+0900\n"
 "Last-Translator: Keita Maehara <maehara@debian.org>\n"
 "Language-Team: Debian Japanease List <debian-japanese@lists.debian.org>\n"
@@ -68,19 +68,19 @@ msgstr "%d
 msgid "Signal no.%d"
 msgstr "%d番のシグナルが発生しました。"
 
-#: lib/database.c:124
+#: lib/database.c:125
 #, fuzzy, c-format
 msgid "couldn't allocate memory for strdup in findpackage(%s)"
 msgstr ""
 "dpkg: 失敗したパッケージ一覧に新しいエントリを追加するためのメモリを割り当て"
 "ることができませんでした。"
 
-#: lib/database.c:194
+#: lib/database.c:195
 #, c-format
 msgid "size %7d occurs %5d times\n"
 msgstr "%7d サイズが %5d 回発生しました\n"
 
-#: lib/database.c:195
+#: lib/database.c:196
 msgid "failed write during hashreport"
 msgstr "ハッシュレポート中に書き込みに失敗しました。"
 
@@ -766,42 +766,38 @@ msgstr "
 msgid "must start with an alphanumeric"
 msgstr "英数字で始まらなければいけません。"
 
-#: lib/parsehelp.c:115
-msgid "must be at least two characters"
-msgstr "少なくとも2文字必要です。"
-
-#: lib/parsehelp.c:124
+#: lib/parsehelp.c:123
 #, c-format
 msgid "character `%c' not allowed - only letters, digits and %s allowed"
 msgstr "文字`%c'は許されません - 文字、数値と %s のみ使用可能です。"
 
-#: lib/parsehelp.c:179
+#: lib/parsehelp.c:178
 msgid "<none>"
 msgstr "<なし>"
 
-#: lib/parsehelp.c:194
+#: lib/parsehelp.c:193
 msgid "version string is empty"
 msgstr "バージョン文字が空です。"
 
-#: lib/parsehelp.c:205
+#: lib/parsehelp.c:204
 #, fuzzy
 msgid "version string has embedded spaces"
 msgstr "バージョン文字が空です。"
 
-#: lib/parsehelp.c:210
+#: lib/parsehelp.c:209
 msgid "epoch in version is not number"
 msgstr "バージョン中の epoch が数値でありません。"
 
-#: lib/parsehelp.c:211
+#: lib/parsehelp.c:210
 msgid "nothing after colon in version number"
 msgstr "バージョン番号のコロンの後に何もありません。"
 
-#: lib/parsehelp.c:233
+#: lib/parsehelp.c:232
 #, c-format
 msgid "missing %s"
 msgstr "%s が見付かりません"
 
-#: lib/parsehelp.c:237
+#: lib/parsehelp.c:236
 #, c-format
 msgid "empty value for %s"
 msgstr "%s の空の値"
@@ -1492,88 +1488,88 @@ msgstr "conffile
 msgid "EOF on stdin at conffile prompt"
 msgstr "conffile プロンプトで標準入力上の EOF です。"
 
-#: main/depcon.c:74
+#: main/depcon.c:76
 #, c-format
 msgid "unable to check for existence of `%.250s'"
 msgstr "`%.250s'の存在をチェックできません。"
 
-#: main/depcon.c:134 main/packages.c:386
+#: main/depcon.c:153 main/packages.c:389
 msgid " depends on "
 msgstr " は以下に依存(depends)します: "
 
-#: main/depcon.c:135
+#: main/depcon.c:154
 msgid " pre-depends on "
 msgstr " は以下に先行依存(pre-depends)します: "
 
-#: main/depcon.c:136
+#: main/depcon.c:155
 msgid " recommends "
 msgstr " は以下を推奨(recommends)します: "
 
-#: main/depcon.c:137
+#: main/depcon.c:156
 msgid " conflicts with "
 msgstr " は以下と衝突(conflicts)します: "
 
-#: main/depcon.c:138
+#: main/depcon.c:157
 msgid " suggests "
 msgstr "は以下のパッケージを提案しています"
 
-#: main/depcon.c:139
+#: main/depcon.c:158
 msgid " enhances "
 msgstr " は以下を強化(enhances)します: "
 
-#: main/depcon.c:215
+#: main/depcon.c:234
 #, c-format
 msgid "  %.250s is to be removed.\n"
 msgstr "  %.250s は削除されようとしています。\n"
 
-#: main/depcon.c:218
+#: main/depcon.c:237
 #, c-format
 msgid "  %.250s is to be deconfigured.\n"
 msgstr "  %.250s は設定が消されようとしています。\n"
 
-#: main/depcon.c:222
+#: main/depcon.c:241
 #, c-format
 msgid "  %.250s is to be installed, but is version %.250s.\n"
 msgstr ""
 "  %.250s がインストールされようとしていますが、バージョンが %.250s です。\n"
 
-#: main/depcon.c:230
+#: main/depcon.c:249
 #, c-format
 msgid "  %.250s is installed, but is version %.250s.\n"
 msgstr "  %.250s がインストールされていますが、バージョンが %.250s です。\n"
 
-#: main/depcon.c:245
+#: main/depcon.c:264
 #, c-format
 msgid "  %.250s is unpacked, but has never been configured.\n"
 msgstr "  %.250s は展開されていますが、設定されていません。\n"
 
-#: main/depcon.c:249
+#: main/depcon.c:268
 #, c-format
 msgid "  %.250s is unpacked, but is version %.250s.\n"
 msgstr "  %.250s は展開されていますが、バージョンが %.250s です。\n"
 
-#: main/depcon.c:255
+#: main/depcon.c:274
 #, c-format
 msgid "  %.250s latest configured version is %.250s.\n"
 msgstr "  %.250s の最新設定済バージョンは %.250s です。\n"
 
-#: main/depcon.c:264
+#: main/depcon.c:283
 #, c-format
 msgid "  %.250s is %s.\n"
 msgstr "  %.250s は %s です。\n"
 
-#: main/depcon.c:300
+#: main/depcon.c:319
 #, c-format
 msgid "  %.250s provides %.250s but is to be removed.\n"
 msgstr "  %.250s は %.250s を提供していますが削除されようとしています。\n"
 
-#: main/depcon.c:304
+#: main/depcon.c:323
 #, c-format
 msgid "  %.250s provides %.250s but is to be deconfigured.\n"
 msgstr ""
 "  %.250s は %.250s を提供していますが設定が削除されようとしています。\n"
 
-#: main/depcon.c:309
+#: main/depcon.c:328
 #, c-format
 msgid "  %.250s provides %.250s but is %s.\n"
 msgstr "  %2$.250s を提供(provides)する %1$.250s が %3$s です。\n"
@@ -1581,28 +1577,28 @@ msgstr "  %2$.250s
 #. If the package wasn't installed at all, and we haven't said
 #. * yet why this isn't satisfied, we should say so now.
 #.
-#: main/depcon.c:323
+#: main/depcon.c:342
 #, c-format
 msgid "  %.250s is not installed.\n"
 msgstr "  %.250s はインストールされていません。\n"
 
-#: main/depcon.c:354
+#: main/depcon.c:373
 #, c-format
 msgid "  %.250s (version %.250s) is to be installed.\n"
 msgstr "  %.250s (バージョン %.250s)がインストールされようとしています。\n"
 
-#: main/depcon.c:368
+#: main/depcon.c:387
 #, c-format
 msgid "  %.250s (version %.250s) is %s.\n"
 msgstr "  %.250s (バージョン %.250s)が %s です。\n"
 
 #. conflicts and provides the same
-#: main/depcon.c:393
+#: main/depcon.c:412
 #, c-format
 msgid "  %.250s provides %.250s and is to be installed.\n"
 msgstr "  %2$.250s を提供する %1$.250s がインストールされようとしています。\n"
 
-#: main/depcon.c:424
+#: main/depcon.c:443
 #, c-format
 msgid "  %.250s provides %.250s and is %s.\n"
 msgstr "  %2$.250s を提供する %1$.250s が %3$s です。\n"
@@ -2195,11 +2191,11 @@ msgid ""
 "  --abort-after <n>              Abort after encountering <n> errors\n"
 "\n"
 "Comparison operators for --compare-versions are:\n"
-" lt le eq ne ge gt       (treat no version as earlier than any version);\n"
-" lt-nl le-nl ge-nl gt-nl (treat no version as later than any version);\n"
+" lt le eq ne ge gt       (treat empty version as earlier than any version);\n"
+" lt-nl le-nl ge-nl gt-nl (treat empty version as later than any version);\n"
 " < << <= = >= >> >       (only for compatibility with control file syntax).\n"
 "\n"
-"Use `dselect' for user-friendly package management.\n"
+"Use `dselect' or 'aptitude' for user-friendly package management.\n"
 msgstr ""
 "使用方法: \n"
 "  dpkg -i|--install      <.deb ファイル名> ... | -R|--recursive <ディレクトリ"
@@ -2299,7 +2295,7 @@ msgstr ""
 "[*]のある物は大量の情報が出力されます。パイプを使い`less'や`more'で見ましょ"
 "う!"
 
-#: main/main.c:185 main/query.c:506 dpkg-deb/main.c:157 split/main.c:144
+#: main/main.c:185 main/query.c:506 dpkg-deb/main.c:157 split/main.c:146
 #, c-format
 msgid "conflicting actions --%s and --%s"
 msgstr "アクション --%s と --%s が競合します。"
@@ -2483,7 +2479,7 @@ msgid "unexpected eof before end of line %d"
 msgstr "%d 行目の行末までに予期しない eof があります。"
 
 #: main/main.c:540 main/main.c:555 main/query.c:541 dpkg-deb/main.c:169
-#: split/main.c:157
+#: split/main.c:159
 msgid "need an action option"
 msgstr "アクションを指定するオプションが必要です。"
 
@@ -2520,43 +2516,43 @@ msgstr ""
 "現在の実行中にパッケージ %s のコピーが複数展開されました!\n"
 "1 回だけ設定を行います。\n"
 
-#: main/packages.c:264 main/packages.c:308 main/packages.c:321
+#: main/packages.c:267 main/packages.c:311 main/packages.c:324
 msgid "  Package "
 msgstr "  パッケージ "
 
-#: main/packages.c:267 main/packages.c:311 main/packages.c:324
+#: main/packages.c:270 main/packages.c:314 main/packages.c:327
 msgid " which provides "
 msgstr " が: "
 
-#: main/packages.c:270
+#: main/packages.c:273
 msgid " is to be removed.\n"
 msgstr " を提供していますが、削除しようとしています。\n"
 
-#: main/packages.c:282
+#: main/packages.c:285
 msgid "  Version of "
 msgstr "  システムの"
 
-#: main/packages.c:284
+#: main/packages.c:287
 msgid " on system is "
 msgstr "のバージョンは "
 
-#: main/packages.c:304
+#: main/packages.c:307
 #, c-format
 msgid "dpkg: also configuring `%s' (required by `%s')\n"
 msgstr "dpkg: (`%2$s'により要求される)`%1$s'も設定しています。\n"
 
-#: main/packages.c:314
+#: main/packages.c:317
 msgid " is not configured yet.\n"
 msgstr " はまだ設定されていません。\n"
 
-#: main/packages.c:327
+#: main/packages.c:330
 msgid " is not installed.\n"
 msgstr " はインストールされていません。\n"
 
 #. Don't print the line about the package to be removed if
 #. * that's the only line.
 #.
-#: main/packages.c:392
+#: main/packages.c:395
 msgid "; however:\n"
 msgstr " ...しかし:\n"
 
@@ -3496,10 +3492,10 @@ msgid "archive has malformatted ctrl len `%s'"
 msgstr "アーカイブのコントロール長 `%s' は不正な形式です。"
 
 #: dpkg-deb/extract.c:193
-#, c-format
+#, fuzzy, c-format
 msgid ""
 " old debian package, version %s.\n"
-" size %ld bytes: control archive= %ld, main archive= %zi.\n"
+" size %ld bytes: control archive= %zi, main archive= %ld.\n"
 msgstr ""
 " 旧形式 debian パッケージ, バージョン %s.\n"
 " サイズ %ld バイト: コントロールアーカイブ = %ld, メインアーカイブ = %zi.\n"
@@ -3900,7 +3896,7 @@ msgid "file `%.250s' is not an archive part"
 msgstr "ファイル `%.250s' はアーカイブパートではありません。"
 
 #: split/info.c:188
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "%s:\n"
 "    Part format version:            %s\n"
@@ -3910,9 +3906,9 @@ msgid ""
 "        ... length:                 %lu bytes\n"
 "        ... split every:            %lu bytes\n"
 "    Part number:                    %d/%d\n"
-"    Part length:                    %lu bytes\n"
+"    Part length:                    %zi bytes\n"
 "    Part offset:                    %lu bytes\n"
-"    Part file size (used portion):  %zi bytes\n"
+"    Part file size (used portion):  %lu bytes\n"
 "\n"
 msgstr ""
 "%s:\n"
@@ -3973,11 +3969,11 @@ msgstr "--join
 msgid "part %d is missing"
 msgstr "パート %d がありません。"
 
-#: split/main.c:38
+#: split/main.c:40
 msgid "Debian GNU/Linux `dpkg-split' package split/join tool; version "
 msgstr "Debian GNU/Linux `dpkg-split' パッケージ分割/結合ツール; バージョン "
 
-#: split/main.c:40
+#: split/main.c:42
 msgid ""
 "Copyright (C) 1994-1996 Ian Jackson.  This is free software; see the\n"
 "GNU General Public Licence version 2 or later for copying conditions.\n"
@@ -3987,7 +3983,7 @@ msgstr ""
 "GNU一般公有使用許諾書バージョン2かそれ以上を参照してください。\n"
 "無保証です。詳細は dpkg-split --licence を参照してください。\n"
 
-#: split/main.c:47
+#: split/main.c:49
 #, c-format
 msgid ""
 "Usage: dpkg-split -s|--split <file> [<prefix>]     Split an archive.\n"
@@ -4031,30 +4027,30 @@ msgstr ""
 "\n"
 "終了ステータス: 0 = OK;  1 = -a がひとつのパートでない;  2 = 問題発生!\n"
 
-#: split/main.c:68
+#: split/main.c:70
 msgid "Type dpkg-split --help for help."
 msgstr "ヘルプは dpkg-split --help で参照。"
 
-#: split/main.c:78
+#: split/main.c:80
 #, c-format
 msgid "error reading %s"
 msgstr "%s の読み込みエラーです。"
 
-#: split/main.c:82
+#: split/main.c:84
 #, c-format
 msgid "error reading %.250s"
 msgstr "%.250s の読み込みエラーです。"
 
-#: split/main.c:83
+#: split/main.c:85
 #, c-format
 msgid "unexpected end of file in %.250s"
 msgstr "%.250s 内で予期しないファイルの終わりです。"
 
-#: split/main.c:103
+#: split/main.c:105
 msgid "part size is far too large or is not positive"
 msgstr "パートサイズが大きすぎるか、または正値でありません。"
 
-#: split/main.c:107
+#: split/main.c:109
 #, c-format
 msgid "part size must be at least %dk (to allow for header)"
 msgstr ""
@@ -4231,37 +4227,37 @@ msgstr "mdfile"
 msgid "%s: unrecognized line\n"
 msgstr "%s: 認識できない行: %s"
 
-#: utils/md5sum.c:284
+#: utils/md5sum.c:292
 #, c-format
 msgid "%s: can't open %s\n"
 msgstr "%s: %s をオープンできません。\n"
 
-#: utils/md5sum.c:288
+#: utils/md5sum.c:296
 #, c-format
 msgid "%s: error reading %s\n"
 msgstr "%s: %s の読み込みエラーです。\n"
 
-#: utils/md5sum.c:294
+#: utils/md5sum.c:302
 #, c-format
 msgid "FAILED\n"
 msgstr "失敗\n"
 
-#: utils/md5sum.c:296
+#: utils/md5sum.c:304
 #, c-format
 msgid "%s: MD5 check failed for '%s'\n"
 msgstr "%s: '%s'に対する MD5 チェックに失敗しました\n"
 
-#: utils/md5sum.c:299
+#: utils/md5sum.c:307
 #, c-format
 msgid "OK\n"
 msgstr "OK\n"
 
-#: utils/md5sum.c:303
+#: utils/md5sum.c:311
 #, c-format
 msgid "%s: %d of %d file(s) failed MD5 check\n"
 msgstr "%1$s: %3$d ファイル中 %2$d ファイルが MD5 チェックに失敗しました。\n"
 
-#: utils/md5sum.c:305
+#: utils/md5sum.c:313
 #, c-format
 msgid "%s: no files checked\n"
 msgstr "%s: ファイルがチェックされませんでした。\n"
@@ -5333,9 +5329,10 @@ msgid " verbose:v help:?"
 msgstr " 詳細:v ヘルプ:?"
 
 #: dselect/pkginfo.cc:82
+#, fuzzy
 msgid ""
 "The line you have highlighted represents many packages; if you ask to "
-"install, remove, hold, &c it you will affect all the packages which match "
+"install, remove, hold, etc. it you will affect all the packages which match "
 "the criterion shown.\n"
 "\n"
 "If you move the highlight to a line for a particular package you will see "
@@ -5490,9 +5487,10 @@ msgid "Keystrokes"
 msgstr "キー操作"
 
 #: dselect/helpmsgs.cc:8
+#, fuzzy
 msgid ""
 "Motion keys: Next/Previous, Top/End, Up/Down, Backwards/Forwards:\n"
-"  n, Down-arrow, j      p, Up-arrow, k          move highlight\n"
+"  Down-arrow, j         Up-arrow, k             move highlight\n"
 "  N, Page-down, Space   P, Page-up, Backspace   scroll list by 1 page\n"
 "  ^n                    ^p                      scroll list by 1 line\n"
 "  t, Home               e, End                  jump to top/end of list\n"
@@ -5518,7 +5516,7 @@ msgid ""
 "   R     Revert to state before this list      ^l   redraw display\n"
 "   U     set all to sUggested state             /   search (Return to "
 "cancel)\n"
-"   D     set all to Directly requested state    \\   repeat last search\n"
+"   D     set all to Directly requested state  n, \\  repeat last search\n"
 msgstr ""
 "移動キー: 次候補/前候補、先頭/最後尾ジャンプ、上/下/左/右スクロール:\n"
 "  n, 下矢印キー, j      p, 上矢印キー, k        ハイライトを移動\n"
@@ -5932,6 +5930,9 @@ msgstr ""
 "  /                検索 (リターンキーでキャンセル)\n"
 "  \\                検索次候補\n"
 
+#~ msgid "must be at least two characters"
+#~ msgstr "少なくとも2文字必要です。"
+
 #~ msgid ""
 #~ "Your currently installed version of the file is in:\n"
 #~ " %s\n"

po/nl.po

@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dpkg 1.9.4\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-04-25 18:54+0100\n"
+"POT-Creation-Date: 2004-06-01 18:18-0300\n"
 "PO-Revision-Date: 2003-08-29 14:54+0100\n"
 "Last-Translator: Bart Cornelis <cobaco@linux.be>\n"
 "Language-Team: Dutch <debian-l10n-dutch@debian.org>\n"
@@ -52,17 +52,17 @@ msgstr "Systeemfout nr.%d"
 msgid "Signal no.%d"
 msgstr "Signaal nr.%d"
 
-#: lib/database.c:124
+#: lib/database.c:125
 #, c-format
 msgid "couldn't allocate memory for strdup in findpackage(%s)"
 msgstr "reserveren van geheugen voor strdup in findpackage(%s) mislukte"
 
-#: lib/database.c:194
+#: lib/database.c:195
 #, c-format
 msgid "size %7d occurs %5d times\n"
 msgstr "grootte %7d komt %5d keer voor\n"
 
-#: lib/database.c:195
+#: lib/database.c:196
 msgid "failed write during hashreport"
 msgstr "schrijven mislukte tijdens frommelrapport"
 
@@ -749,41 +749,37 @@ msgstr "mag niet een lege string zijn"
 msgid "must start with an alphanumeric"
 msgstr "moet beginnen met een alfanumeriek teken"
 
-#: lib/parsehelp.c:115
-msgid "must be at least two characters"
-msgstr "moet ten minste twee tekens zijn"
-
-#: lib/parsehelp.c:124
+#: lib/parsehelp.c:123
 #, c-format
 msgid "character `%c' not allowed - only letters, digits and %s allowed"
 msgstr "teken `%c' niet toegestaan - slechts letters, cijfers en %s toegestaan"
 
-#: lib/parsehelp.c:179
+#: lib/parsehelp.c:178
 msgid "<none>"
 msgstr "<geen>"
 
-#: lib/parsehelp.c:194
+#: lib/parsehelp.c:193
 msgid "version string is empty"
 msgstr "versiestring is leeg"
 
-#: lib/parsehelp.c:205
+#: lib/parsehelp.c:204
 msgid "version string has embedded spaces"
 msgstr "versiestring bevat spaties"
 
-#: lib/parsehelp.c:210
+#: lib/parsehelp.c:209
 msgid "epoch in version is not number"
 msgstr "epoch in versienummer is geen nummer"
 
-#: lib/parsehelp.c:211
+#: lib/parsehelp.c:210
 msgid "nothing after colon in version number"
 msgstr "er komt niets na de dubbele punt in het versienummer"
 
-#: lib/parsehelp.c:233
+#: lib/parsehelp.c:232
 #, c-format
 msgid "missing %s"
 msgstr "ontbrekende %s"
 
-#: lib/parsehelp.c:237
+#: lib/parsehelp.c:236
 #, c-format
 msgid "empty value for %s"
 msgstr "lege waarde voor %s"
@@ -1492,86 +1488,86 @@ msgstr "leesfout op stdin bij conffile prompt"
 msgid "EOF on stdin at conffile prompt"
 msgstr "EOF op stdin bij conffile prompt"
 
-#: main/depcon.c:74
+#: main/depcon.c:76
 #, c-format
 msgid "unable to check for existence of `%.250s'"
 msgstr "kon het bestaan van `%.250s' niet verifiëren"
 
-#: main/depcon.c:134 main/packages.c:386
+#: main/depcon.c:153 main/packages.c:389
 msgid " depends on "
 msgstr " is afhankelijk van "
 
-#: main/depcon.c:135
+#: main/depcon.c:154
 msgid " pre-depends on "
 msgstr " is voor-afhankelijk van "
 
-#: main/depcon.c:136
+#: main/depcon.c:155
 msgid " recommends "
 msgstr " beveelt aan "
 
-#: main/depcon.c:137
+#: main/depcon.c:156
 msgid " conflicts with "
 msgstr " is in strijd met "
 
-#: main/depcon.c:138
+#: main/depcon.c:157
 msgid " suggests "
 msgstr " stelt voor "
 
-#: main/depcon.c:139
+#: main/depcon.c:158
 msgid " enhances "
 msgstr " verbetert "
 
-#: main/depcon.c:215
+#: main/depcon.c:234
 #, c-format
 msgid "  %.250s is to be removed.\n"
 msgstr "  %.250s wordt verwijderd.\n"
 
-#: main/depcon.c:218
+#: main/depcon.c:237
 #, c-format
 msgid "  %.250s is to be deconfigured.\n"
 msgstr "  %.250s wordt gedeconfigureerd.\n"
 
-#: main/depcon.c:222
+#: main/depcon.c:241
 #, c-format
 msgid "  %.250s is to be installed, but is version %.250s.\n"
 msgstr "  %.250s wordt geïnstalleerd, maar is versie %.250s.\n"
 
-#: main/depcon.c:230
+#: main/depcon.c:249
 #, c-format
 msgid "  %.250s is installed, but is version %.250s.\n"
 msgstr "  %.250s is geïnstalleerd, maar is versie %.250s.\n"
 
-#: main/depcon.c:245
+#: main/depcon.c:264
 #, c-format
 msgid "  %.250s is unpacked, but has never been configured.\n"
 msgstr "  %.250s is uitgepakt, maar is nooit geconfigureerd.\n"
 
-#: main/depcon.c:249
+#: main/depcon.c:268
 #, c-format
 msgid "  %.250s is unpacked, but is version %.250s.\n"
 msgstr "  %.250s is uitgepakt, maar is versie %.250s.\n"
 
-#: main/depcon.c:255
+#: main/depcon.c:274
 #, c-format
 msgid "  %.250s latest configured version is %.250s.\n"
 msgstr "  %.250s laatst geconfigureerde versie is %.250s.\n"
 
-#: main/depcon.c:264
+#: main/depcon.c:283
 #, c-format
 msgid "  %.250s is %s.\n"
 msgstr "  %.250s is %s.\n"
 
-#: main/depcon.c:300
+#: main/depcon.c:319
 #, c-format
 msgid "  %.250s provides %.250s but is to be removed.\n"
 msgstr "  %.250s bevat %.250s maar wordt verwijderd.\n"
 
-#: main/depcon.c:304
+#: main/depcon.c:323
 #, c-format
 msgid "  %.250s provides %.250s but is to be deconfigured.\n"
 msgstr "  %.250s bevat %.250s maar wordt gedeconfigureerd.\n"
 
-#: main/depcon.c:309
+#: main/depcon.c:328
 #, c-format
 msgid "  %.250s provides %.250s but is %s.\n"
 msgstr "  %.250s bevat %.250s maar is %s.\n"
@@ -1579,28 +1575,28 @@ msgstr "  %.250s bevat %.250s maar is %s.\n"
 #. If the package wasn't installed at all, and we haven't said
 #. * yet why this isn't satisfied, we should say so now.
 #.
-#: main/depcon.c:323
+#: main/depcon.c:342
 #, c-format
 msgid "  %.250s is not installed.\n"
 msgstr "  %.250s is niet geïnstalleerd.\n"
 
-#: main/depcon.c:354
+#: main/depcon.c:373
 #, c-format
 msgid "  %.250s (version %.250s) is to be installed.\n"
 msgstr "  %.250s (versie %.250s) wordt geïnstalleerd.\n"
 
-#: main/depcon.c:368
+#: main/depcon.c:387
 #, c-format
 msgid "  %.250s (version %.250s) is %s.\n"
 msgstr "  %.250s (versie (%.250s) is %s.\n"
 
 #. conflicts and provides the same
-#: main/depcon.c:393
+#: main/depcon.c:412
 #, c-format
 msgid "  %.250s provides %.250s and is to be installed.\n"
 msgstr "  %.250s bevat %.250s en wordt geïnstalleerd\n"
 
-#: main/depcon.c:424
+#: main/depcon.c:443
 #, c-format
 msgid "  %.250s provides %.250s and is %s.\n"
 msgstr "  %.250s bevat %.250s en is %s.\n"
@@ -2128,7 +2124,7 @@ msgid " --licence for copyright and license details.\n"
 msgstr " --licence voor copyright en licentie details.\n"
 
 #: main/main.c:58
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "Usage: \n"
 "  dpkg -i|--install      <.deb file name> ... | -R|--recursive <dir> ...\n"
@@ -2190,11 +2186,11 @@ msgid ""
 "  --abort-after <n>              Abort after encountering <n> errors\n"
 "\n"
 "Comparison operators for --compare-versions are:\n"
-" lt le eq ne ge gt       (treat no version as earlier than any version);\n"
-" lt-nl le-nl ge-nl gt-nl (treat no version as later than any version);\n"
+" lt le eq ne ge gt       (treat empty version as earlier than any version);\n"
+" lt-nl le-nl ge-nl gt-nl (treat empty version as later than any version);\n"
 " < << <= = >= >> >       (only for compatibility with control file syntax).\n"
 "\n"
-"Use `dselect' 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"
@@ -2296,7 +2292,7 @@ msgstr ""
 "Opties gemarkeerd met [*] produreren een hoop uitvoer - pijp het door `less' "
 "of `more' !"
 
-#: main/main.c:185 main/query.c:506 dpkg-deb/main.c:157 split/main.c:144
+#: main/main.c:185 main/query.c:506 dpkg-deb/main.c:157 split/main.c:146
 #, c-format
 msgid "conflicting actions --%s and --%s"
 msgstr "tegenstrijdige acties --%s en --%s"
@@ -2493,7 +2489,7 @@ msgid "unexpected eof before end of line %d"
 msgstr "onverwacht bestandseinde voor einde regel %d"
 
 #: main/main.c:540 main/main.c:555 main/query.c:541 dpkg-deb/main.c:169
-#: split/main.c:157
+#: split/main.c:159
 msgid "need an action option"
 msgstr "heb een actie-optie nodig"
 
@@ -2529,43 +2525,43 @@ msgstr ""
 "Meer dan een kopie van pakket %s is uitgepakt in deze ronde!\n"
 " Wordt slechts een keer geconfigureerd.\n"
 
-#: main/packages.c:264 main/packages.c:308 main/packages.c:321
+#: main/packages.c:267 main/packages.c:311 main/packages.c:324
 msgid "  Package "
 msgstr "  Pakket "
 
-#: main/packages.c:267 main/packages.c:311 main/packages.c:324
+#: main/packages.c:270 main/packages.c:314 main/packages.c:327
 msgid " which provides "
 msgstr " welke levert "
 
-#: main/packages.c:270
+#: main/packages.c:273
 msgid " is to be removed.\n"
 msgstr " wordt verwijderd.\n"
 
-#: main/packages.c:282
+#: main/packages.c:285
 msgid "  Version of "
 msgstr "  Versie van "
 
-#: main/packages.c:284
+#: main/packages.c:287
 msgid " on system is "
 msgstr " op het systeem is "
 
-#: main/packages.c:304
+#: main/packages.c:307
 #, c-format
 msgid "dpkg: also configuring `%s' (required by `%s')\n"
 msgstr "dpkg: ook `%s' wordt geconfigureerd (vereist door `%s')\n"
 
-#: main/packages.c:314
+#: main/packages.c:317
 msgid " is not configured yet.\n"
 msgstr " is nog niet geconfigureerd.\n"
 
-#: main/packages.c:327
+#: main/packages.c:330
 msgid " is not installed.\n"
 msgstr " is niet geïnstalleerd.\n"
 
 #. Don't print the line about the package to be removed if
 #. * that's the only line.
 #.
-#: main/packages.c:392
+#: main/packages.c:395
 msgid "; however:\n"
 msgstr "; maar:\n"
 
@@ -3485,10 +3481,10 @@ msgid "archive has malformatted ctrl len `%s'"
 msgstr "archief heeft verkeerde besturingslengte `%s'"
 
 #: dpkg-deb/extract.c:193
-#, c-format
+#, fuzzy, c-format
 msgid ""
 " old debian package, version %s.\n"
-" size %ld bytes: control archive= %ld, main archive= %zi.\n"
+" size %ld bytes: control archive= %zi, main archive= %ld.\n"
 msgstr ""
 " oud debian pakket, versie %s.\n"
 " grootte %ld bytes: besturingsarchief= %ld, hoofdarchief= %zi.\n"
@@ -3872,7 +3868,7 @@ msgid "file `%.250s' is not an archive part"
 msgstr "bestand `%.250s' is niet een archiefonderdeel"
 
 #: split/info.c:188
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "%s:\n"
 "    Part format version:            %s\n"
@@ -3882,9 +3878,9 @@ msgid ""
 "        ... length:                 %lu bytes\n"
 "        ... split every:            %lu bytes\n"
 "    Part number:                    %d/%d\n"
-"    Part length:                    %lu bytes\n"
+"    Part length:                    %zi bytes\n"
 "    Part offset:                    %lu bytes\n"
-"    Part file size (used portion):  %zi bytes\n"
+"    Part file size (used portion):  %lu bytes\n"
 "\n"
 msgstr ""
 "%s:\n"
@@ -3944,11 +3940,11 @@ msgstr "--join vereist een of meerdere deelbestanden als argumenten"
 msgid "part %d is missing"
 msgstr "deel %d ontbreekt"
 
-#: split/main.c:38
+#: split/main.c:40
 msgid "Debian GNU/Linux `dpkg-split' package split/join tool; version "
 msgstr "Debian GNU/Linux `dpkg-split' pakket splits-/samenvoegmiddel; versie "
 
-#: split/main.c:40
+#: split/main.c:42
 msgid ""
 "Copyright (C) 1994-1996 Ian Jackson.  This is free software; see the\n"
 "GNU General Public Licence version 2 or later for copying conditions.\n"
@@ -3958,7 +3954,7 @@ msgstr ""
 "de GNU General Public License versie 2 of later voor kopieervoorwaarden.\n"
 "Er is GEEN garantie.  Zie dpkg-split --licence voor details.\n"
 
-#: split/main.c:47
+#: split/main.c:49
 #, c-format
 msgid ""
 "Usage: dpkg-split -s|--split <file> [<prefix>]     Split an archive.\n"
@@ -4001,30 +3997,30 @@ msgstr ""
 "\n"
 "Statuscode: 0 = OK;  1 = -a is geen deel;  2 = moeilijkheden!\n"
 
-#: split/main.c:68
+#: split/main.c:70
 msgid "Type dpkg-split --help for help."
 msgstr "Type dpkg-split --help voor hulp.c"
 
-#: split/main.c:78
+#: split/main.c:80
 #, c-format
 msgid "error reading %s"
 msgstr "fout bij lezen %s"
 
-#: split/main.c:82
+#: split/main.c:84
 #, c-format
 msgid "error reading %.250s"
 msgstr "fout bij schrijven %.250s"
 
-#: split/main.c:83
+#: split/main.c:85
 #, c-format
 msgid "unexpected end of file in %.250s"
 msgstr "onverwachts bestandseinde in %.250s"
 
-#: split/main.c:103
+#: split/main.c:105
 msgid "part size is far too large or is not positive"
 msgstr "deel is te groot of niet positief"
 
-#: split/main.c:107
+#: split/main.c:109
 #, c-format
 msgid "part size must be at least %dk (to allow for header)"
 msgstr "deel moet ten minste %dk groot zijn (voor informatie)"
@@ -4200,37 +4196,37 @@ msgstr "mdfile"
 msgid "%s: unrecognized line\n"
 msgstr "%s: regel niet herkend: %s"
 
-#: utils/md5sum.c:284
+#: utils/md5sum.c:292
 #, c-format
 msgid "%s: can't open %s\n"
 msgstr "%s: kan %s niet openen\n"
 
-#: utils/md5sum.c:288
+#: utils/md5sum.c:296
 #, c-format
 msgid "%s: error reading %s\n"
 msgstr "%s: fout bij lezen van %s\n"
 
-#: utils/md5sum.c:294
+#: utils/md5sum.c:302
 #, c-format
 msgid "FAILED\n"
 msgstr "MISLUKT\n"
 
-#: utils/md5sum.c:296
+#: utils/md5sum.c:304
 #, c-format
 msgid "%s: MD5 check failed for '%s'\n"
 msgstr "%s: MD5 controle mislukt voor `%s'\n"
 
-#: utils/md5sum.c:299
+#: utils/md5sum.c:307
 #, c-format
 msgid "OK\n"
 msgstr "OK\n"
 
-#: utils/md5sum.c:303
+#: utils/md5sum.c:311
 #, c-format
 msgid "%s: %d of %d file(s) failed MD5 check\n"
 msgstr "%s: %d van %d bestand(en) overleefden MD5 controle niet\n"
 
-#: utils/md5sum.c:305
+#: utils/md5sum.c:313
 #, c-format
 msgid "%s: no files checked\n"
 msgstr "%s: geen bestanden gecontroleerd\n"
@@ -5297,9 +5293,10 @@ msgid " verbose:v help:?"
 msgstr " lang:v hulp:?"
 
 #: dselect/pkginfo.cc:82
+#, fuzzy
 msgid ""
 "The line you have highlighted represents many packages; if you ask to "
-"install, remove, hold, &c it you will affect all the packages which match "
+"install, remove, hold, etc. it you will affect all the packages which match "
 "the criterion shown.\n"
 "\n"
 "If you move the highlight to a line for a particular package you will see "
@@ -5456,9 +5453,10 @@ msgid "Keystrokes"
 msgstr "Toetsen"
 
 #: dselect/helpmsgs.cc:8
+#, fuzzy
 msgid ""
 "Motion keys: Next/Previous, Top/End, Up/Down, Backwards/Forwards:\n"
-"  n, Down-arrow, j      p, Up-arrow, k          move highlight\n"
+"  Down-arrow, j         Up-arrow, k             move highlight\n"
 "  N, Page-down, Space   P, Page-up, Backspace   scroll list by 1 page\n"
 "  ^n                    ^p                      scroll list by 1 line\n"
 "  t, Home               e, End                  jump to top/end of list\n"
@@ -5484,7 +5482,7 @@ msgid ""
 "   R     Revert to state before this list      ^l   redraw display\n"
 "   U     set all to sUggested state             /   search (Return to "
 "cancel)\n"
-"   D     set all to Directly requested state    \\   repeat last search\n"
+"   D     set all to Directly requested state  n, \\  repeat last search\n"
 msgstr ""
 "Bewegingstoetsen: Volgende/Vorige, Begin/Einde, Op/Neer, Achter-/Vooruit:\n"
 "  n, Neer, j            p, Omhoog, k            beweeg selectie\n"
@@ -5905,3 +5903,6 @@ msgstr ""
 " ^l                scherm opnieuw tekenen\n"
 "  /                zoeken (alleen enter voor annuleren)\n"
 "  \\                laatste zoekopdracht herhalen\n"
+
+#~ msgid "must be at least two characters"
+#~ msgstr "moet ten minste twee tekens zijn"

po/nn.po

@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: nn\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-04-25 18:54+0100\n"
+"POT-Creation-Date: 2004-06-01 18:18-0300\n"
 "PO-Revision-Date: 2004-04-01 23:23+0200\n"
 "Last-Translator: Gaute Hvoslef Kvalnes <gaute@verdsveven.com>\n"
 "Language-Team: Norwegian Nynorsk <i18n-nn@lister.ping.uio.no>\n"
@@ -57,17 +57,17 @@ msgstr "Systemfeil nr. %d"
 msgid "Signal no.%d"
 msgstr "Signal nr. %d"
 
-#: lib/database.c:124
+#: lib/database.c:125
 #, c-format
 msgid "couldn't allocate memory for strdup in findpackage(%s)"
 msgstr "klarte ikkje tildela minne for strdup i findpackage(%s)"
 
-#: lib/database.c:194
+#: lib/database.c:195
 #, c-format
 msgid "size %7d occurs %5d times\n"
 msgstr "storleik %7d førekjem %5d gonger\n"
 
-#: lib/database.c:195
+#: lib/database.c:196
 msgid "failed write during hashreport"
 msgstr "klarte ikkje skriva under «hashreport»"
 
@@ -752,42 +752,38 @@ msgstr "kan ikkje vera ein tom streng"
 msgid "must start with an alphanumeric"
 msgstr "må starta med eit alfanumerisk teikn"
 
-#: lib/parsehelp.c:115
-msgid "must be at least two characters"
-msgstr "må ha minst to teikn"
-
-#: lib/parsehelp.c:124
+#: lib/parsehelp.c:123
 #, c-format
 msgid "character `%c' not allowed - only letters, digits and %s allowed"
 msgstr ""
 "teiknet «%c» kan ikkje brukast - berre bokstavar, siffer og %s kan brukast"
 
-#: lib/parsehelp.c:179
+#: lib/parsehelp.c:178
 msgid "<none>"
 msgstr "<ingen>"
 
-#: lib/parsehelp.c:194
+#: lib/parsehelp.c:193
 msgid "version string is empty"
 msgstr "versjonsstrengen er tom"
 
-#: lib/parsehelp.c:205
+#: lib/parsehelp.c:204
 msgid "version string has embedded spaces"
 msgstr "versjonsstrengen inneheld mellomrom"
 
-#: lib/parsehelp.c:210
+#: lib/parsehelp.c:209
 msgid "epoch in version is not number"
 msgstr "epoken i versjonen er ikkje eit tal"
 
-#: lib/parsehelp.c:211
+#: lib/parsehelp.c:210
 msgid "nothing after colon in version number"
 msgstr "ingenting etter kolonet i versjonsnummeret"
 
-#: lib/parsehelp.c:233
+#: lib/parsehelp.c:232
 #, c-format
 msgid "missing %s"
 msgstr "manglar %s"
 
-#: lib/parsehelp.c:237
+#: lib/parsehelp.c:236
 #, c-format
 msgid "empty value for %s"
 msgstr "tom verdi for %s"
@@ -1478,86 +1474,86 @@ msgstr "lesefeil på standard-inn ved oppsettsfilprompt"
 msgid "EOF on stdin at conffile prompt"
 msgstr "slutt på fil ved standard-inn ved oppsettsfilprompt"
 
-#: main/depcon.c:74
+#: main/depcon.c:76
 #, c-format
 msgid "unable to check for existence of `%.250s'"
 msgstr "klarte ikkje sjekka om «%.250s» finst"
 
-#: main/depcon.c:134 main/packages.c:386
+#: main/depcon.c:153 main/packages.c:389
 msgid " depends on "
 msgstr " krev "
 
-#: main/depcon.c:135
+#: main/depcon.c:154
 msgid " pre-depends on "
 msgstr " før-krev "
 
-#: main/depcon.c:136
+#: main/depcon.c:155
 msgid " recommends "
 msgstr " tilrår "
 
-#: main/depcon.c:137
+#: main/depcon.c:156
 msgid " conflicts with "
 msgstr " er i konflikt med "
 
-#: main/depcon.c:138
+#: main/depcon.c:157
 msgid " suggests "
 msgstr " føreslår "
 
-#: main/depcon.c:139
+#: main/depcon.c:158
 msgid " enhances "
 msgstr " forbetrar "
 
-#: main/depcon.c:215
+#: main/depcon.c:234
 #, c-format
 msgid "  %.250s is to be removed.\n"
 msgstr "  %.250s vil verta fjerna.\n"
 
-#: main/depcon.c:218
+#: main/depcon.c:237
 #, c-format
 msgid "  %.250s is to be deconfigured.\n"
 msgstr "  Oppsettet av %.250s vil verta fjerna.\n"
 
-#: main/depcon.c:222
+#: main/depcon.c:241
 #, c-format
 msgid "  %.250s is to be installed, but is version %.250s.\n"
 msgstr "  %.250s skal installerast, men versjonen er %.250s.\n"
 
-#: main/depcon.c:230
+#: main/depcon.c:249
 #, c-format
 msgid "  %.250s is installed, but is version %.250s.\n"
 msgstr "  %.250s er installert, men versjonen er %.250s.\n"
 
-#: main/depcon.c:245
+#: main/depcon.c:264
 #, c-format
 msgid "  %.250s is unpacked, but has never been configured.\n"
 msgstr "  %.250s er pakka ut, men er aldri sett opp.\n"
 
-#: main/depcon.c:249
+#: main/depcon.c:268
 #, c-format
 msgid "  %.250s is unpacked, but is version %.250s.\n"
 msgstr "  %.250s er pakka ut, men versjonen er %.250s.\n"
 
-#: main/depcon.c:255
+#: main/depcon.c:274
 #, c-format
 msgid "  %.250s latest configured version is %.250s.\n"
 msgstr "  %.250s siste oppsette versjon er %.250s.\n"
 
-#: main/depcon.c:264
+#: main/depcon.c:283
 #, c-format
 msgid "  %.250s is %s.\n"
 msgstr "%.250s er %s.\n"
 
-#: main/depcon.c:300
+#: main/depcon.c:319
 #, c-format
 msgid "  %.250s provides %.250s but is to be removed.\n"
 msgstr "  %.250s tilbyr %.250s, men skal fjernast.\n"
 
-#: main/depcon.c:304
+#: main/depcon.c:323
 #, c-format
 msgid "  %.250s provides %.250s but is to be deconfigured.\n"
 msgstr "  %.250s tilbyr %.250s, men oppsettet skal fjernast.\n"
 
-#: main/depcon.c:309
+#: main/depcon.c:328
 #, c-format
 msgid "  %.250s provides %.250s but is %s.\n"
 msgstr "  %.250s tilbyr %.250s, men er %s.\n"
@@ -1565,28 +1561,28 @@ msgstr "  %.250s tilbyr %.250s, men er %s.\n"
 #. If the package wasn't installed at all, and we haven't said
 #. * yet why this isn't satisfied, we should say so now.
 #.
-#: main/depcon.c:323
+#: main/depcon.c:342
 #, c-format
 msgid "  %.250s is not installed.\n"
 msgstr "  %.250s er ikkje installert.\n"
 
-#: main/depcon.c:354
+#: main/depcon.c:373
 #, c-format
 msgid "  %.250s (version %.250s) is to be installed.\n"
 msgstr "  %.250s (versjon %.250s) vil verta installert.\n"
 
-#: main/depcon.c:368
+#: main/depcon.c:387
 #, c-format
 msgid "  %.250s (version %.250s) is %s.\n"
 msgstr "  %.250s (versjon %.250s) er %s.\n"
 
 #. conflicts and provides the same
-#: main/depcon.c:393
+#: main/depcon.c:412
 #, c-format
 msgid "  %.250s provides %.250s and is to be installed.\n"
 msgstr "  %.250s tilbyr %.250s og skal installerast.\n"
 
-#: main/depcon.c:424
+#: main/depcon.c:443
 #, c-format
 msgid "  %.250s provides %.250s and is %s.\n"
 msgstr "  %.250s tilbyr %.250s og er %s.\n"
@@ -2108,7 +2104,7 @@ msgid " --licence for copyright and license details.\n"
 msgstr " --licence for informasjon om opphavsrett og lisens.\n"
 
 #: main/main.c:58
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "Usage: \n"
 "  dpkg -i|--install      <.deb file name> ... | -R|--recursive <dir> ...\n"
@@ -2170,11 +2166,11 @@ msgid ""
 "  --abort-after <n>              Abort after encountering <n> errors\n"
 "\n"
 "Comparison operators for --compare-versions are:\n"
-" lt le eq ne ge gt       (treat no version as earlier than any version);\n"
-" lt-nl le-nl ge-nl gt-nl (treat no version as later than any version);\n"
+" lt le eq ne ge gt       (treat empty version as earlier than any version);\n"
+" lt-nl le-nl ge-nl gt-nl (treat empty version as later than any version);\n"
 " < << <= = >= >> >       (only for compatibility with control file syntax).\n"
 "\n"
-"Use `dselect' 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"
@@ -2281,7 +2277,7 @@ msgstr ""
 "Val markert med [*] gjev mykje tekst - bruk «less» eller «more» for å lesa "
 "informasjonen."
 
-#: main/main.c:185 main/query.c:506 dpkg-deb/main.c:157 split/main.c:144
+#: main/main.c:185 main/query.c:506 dpkg-deb/main.c:157 split/main.c:146
 #, c-format
 msgid "conflicting actions --%s and --%s"
 msgstr "handlingar i konflikt --%s og --%s"
@@ -2470,7 +2466,7 @@ msgid "unexpected eof before end of line %d"
 msgstr "uventa slutt på fil før slutten av linje %d"
 
 #: main/main.c:540 main/main.c:555 main/query.c:541 dpkg-deb/main.c:169
-#: split/main.c:157
+#: split/main.c:159
 msgid "need an action option"
 msgstr "treng eit handlingsval"
 
@@ -2505,43 +2501,43 @@ msgstr ""
 "Fleire kopiar av pakken %s er pakka ut i denne\n"
 " omgangen. Set berre opp éin gong.\n"
 
-#: main/packages.c:264 main/packages.c:308 main/packages.c:321
+#: main/packages.c:267 main/packages.c:311 main/packages.c:324
 msgid "  Package "
 msgstr "  Pakken "
 
-#: main/packages.c:267 main/packages.c:311 main/packages.c:324
+#: main/packages.c:270 main/packages.c:314 main/packages.c:327
 msgid " which provides "
 msgstr " som tilbyr "
 
-#: main/packages.c:270
+#: main/packages.c:273
 msgid " is to be removed.\n"
 msgstr " vil bli fjerna.\n"
 
-#: main/packages.c:282
+#: main/packages.c:285
 msgid "  Version of "
 msgstr "  Versjonen av "
 
-#: main/packages.c:284
+#: main/packages.c:287
 msgid " on system is "
 msgstr " på systemet er "
 
-#: main/packages.c:304
+#: main/packages.c:307
 #, c-format
 msgid "dpkg: also configuring `%s' (required by `%s')\n"
 msgstr "dpkg: set òg opp «%s» (kravd av «%s»)\n"
 
-#: main/packages.c:314
+#: main/packages.c:317
 msgid " is not configured yet.\n"
 msgstr " er ikkje sett opp enno.\n"
 
-#: main/packages.c:327
+#: main/packages.c:330
 msgid " is not installed.\n"
 msgstr " er ikkje installert.\n"
 
 #. Don't print the line about the package to be removed if
 #. * that's the only line.
 #.
-#: main/packages.c:392
+#: main/packages.c:395
 msgid "; however:\n"
 msgstr ". Men:\n"
 
@@ -3487,10 +3483,10 @@ msgid "archive has malformatted ctrl len `%s'"
 msgstr "arkivet har ei misforma kontrollengd «%s»"
 
 #: dpkg-deb/extract.c:193
-#, c-format
+#, fuzzy, c-format
 msgid ""
 " old debian package, version %s.\n"
-" size %ld bytes: control archive= %ld, main archive= %zi.\n"
+" size %ld bytes: control archive= %zi, main archive= %ld.\n"
 msgstr ""
 " gammal Debian-pakke, versjon %s.\n"
 " storleik %ld byte: kontrollarkiv = %ld, hovudarkiv = %zi.\n"
@@ -3887,7 +3883,7 @@ msgid "file `%.250s' is not an archive part"
 msgstr "fila «%.250s» er ikkje ein arkivdel"
 
 #: split/info.c:188
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "%s:\n"
 "    Part format version:            %s\n"
@@ -3897,9 +3893,9 @@ msgid ""
 "        ... length:                 %lu bytes\n"
 "        ... split every:            %lu bytes\n"
 "    Part number:                    %d/%d\n"
-"    Part length:                    %lu bytes\n"
+"    Part length:                    %zi bytes\n"
 "    Part offset:                    %lu bytes\n"
-"    Part file size (used portion):  %zi bytes\n"
+"    Part file size (used portion):  %lu bytes\n"
 "\n"
 msgstr ""
 "%s:\n"
@@ -3958,13 +3954,13 @@ msgstr "--join tek ein eller fleire delfilparametrar"
 msgid "part %d is missing"
 msgstr "delen %d manglar"
 
-#: split/main.c:38
+#: split/main.c:40
 msgid "Debian GNU/Linux `dpkg-split' package split/join tool; version "
 msgstr ""
 "Debian GNU/Linux «dpkg-split», verktøy for pakkedeling og samansetjing, "
 "versjon "
 
-#: split/main.c:40
+#: split/main.c:42
 msgid ""
 "Copyright (C) 1994-1996 Ian Jackson.  This is free software; see the\n"
 "GNU General Public Licence version 2 or later for copying conditions.\n"
@@ -3974,7 +3970,7 @@ msgstr ""
 "GNU General Public Licence versjon 2 eller nyare for kopieringsvilkår.\n"
 "Det er INGEN garanti. Du finn fleire detaljar i «dpkg-split --licence».\n"
 
-#: split/main.c:47
+#: split/main.c:49
 #, c-format
 msgid ""
 "Usage: dpkg-split -s|--split <file> [<prefix>]     Split an archive.\n"
@@ -4018,30 +4014,30 @@ msgstr ""
 "\n"
 "Avsluttingstatus: 0 = OK;  1 = -a er ikkje ein del;  2 = problem!\n"
 
-#: split/main.c:68
+#: split/main.c:70
 msgid "Type dpkg-split --help for help."
 msgstr "Skriv «dpkg-split --help» for hjelp."
 
-#: split/main.c:78
+#: split/main.c:80
 #, c-format
 msgid "error reading %s"
 msgstr "feil ved lesing av %s"
 
-#: split/main.c:82
+#: split/main.c:84
 #, c-format
 msgid "error reading %.250s"
 msgstr "feil ved lesing av %.250s"
 
-#: split/main.c:83
+#: split/main.c:85
 #, c-format
 msgid "unexpected end of file in %.250s"
 msgstr "uventa slutt på fil i %.250s"
 
-#: split/main.c:103
+#: split/main.c:105
 msgid "part size is far too large or is not positive"
 msgstr "delen er altfor stor eller storleiken er ikkje positiv"
 
-#: split/main.c:107
+#: split/main.c:109
 #, c-format
 msgid "part size must be at least %dk (to allow for header)"
 msgstr "delen må minst vera på %dk (for at hovudet skal få plass)"
@@ -4217,37 +4213,37 @@ msgstr "mdfil"
 msgid "%s: unrecognized line\n"
 msgstr "%s: kjende ikkje att linja\n"
 
-#: utils/md5sum.c:284
+#: utils/md5sum.c:292
 #, c-format
 msgid "%s: can't open %s\n"
 msgstr "%s: klarte ikkje opna %s\n"
 
-#: utils/md5sum.c:288
+#: utils/md5sum.c:296
 #, c-format
 msgid "%s: error reading %s\n"
 msgstr "%s: feil ved lesing av %s\n"
 
-#: utils/md5sum.c:294
+#: utils/md5sum.c:302
 #, c-format
 msgid "FAILED\n"
 msgstr "MISLUKKAST\n"
 
-#: utils/md5sum.c:296
+#: utils/md5sum.c:304
 #, c-format
 msgid "%s: MD5 check failed for '%s'\n"
 msgstr "%s: MD5-sjekken mislukkast for «%s»\n"
 
-#: utils/md5sum.c:299
+#: utils/md5sum.c:307
 #, c-format
 msgid "OK\n"
 msgstr "OK\n"
 
-#: utils/md5sum.c:303
+#: utils/md5sum.c:311
 #, c-format
 msgid "%s: %d of %d file(s) failed MD5 check\n"
 msgstr "%s: MD5-sjekk av %d av %d fil(er) mislukkast\n"
 
-#: utils/md5sum.c:305
+#: utils/md5sum.c:313
 #, c-format
 msgid "%s: no files checked\n"
 msgstr "%s: ingen filer sjekka\n"
@@ -5317,9 +5313,10 @@ msgid " verbose:v help:?"
 msgstr " fyldig:v hjelp:?"
 
 #: dselect/pkginfo.cc:82
+#, fuzzy
 msgid ""
 "The line you have highlighted represents many packages; if you ask to "
-"install, remove, hold, &c it you will affect all the packages which match "
+"install, remove, hold, etc. it you will affect all the packages which match "
 "the criterion shown.\n"
 "\n"
 "If you move the highlight to a line for a particular package you will see "
@@ -5475,9 +5472,10 @@ msgid "Keystrokes"
 msgstr "Tastar"
 
 #: dselect/helpmsgs.cc:8
+#, fuzzy
 msgid ""
 "Motion keys: Next/Previous, Top/End, Up/Down, Backwards/Forwards:\n"
-"  n, Down-arrow, j      p, Up-arrow, k          move highlight\n"
+"  Down-arrow, j         Up-arrow, k             move highlight\n"
 "  N, Page-down, Space   P, Page-up, Backspace   scroll list by 1 page\n"
 "  ^n                    ^p                      scroll list by 1 line\n"
 "  t, Home               e, End                  jump to top/end of list\n"
@@ -5503,7 +5501,7 @@ msgid ""
 "   R     Revert to state before this list      ^l   redraw display\n"
 "   U     set all to sUggested state             /   search (Return to "
 "cancel)\n"
-"   D     set all to Directly requested state    \\   repeat last search\n"
+"   D     set all to Directly requested state  n, \\  repeat last search\n"
 msgstr ""
 "Flyttetastar: Neste/Førre, Topp/Botn, Opp/Ned, Fram/Tilbake:\n"
 "  n, Pil ned, j           p, Pil opp, k          flytt markeringa\n"
@@ -5911,6 +5909,9 @@ msgstr ""
 "  /                søk (bruk Enter til å avbryta med ein gong)\n"
 "  \\                siste søk om att\n"
 
+#~ msgid "must be at least two characters"
+#~ msgstr "må ha minst to teikn"
+
 #~ msgid "no gcc-lib component"
 #~ msgstr "manglar gcc-lib-komponent"
 

po/pl.po

@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dpkg 1.9.20\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-04-25 18:54+0100\n"
+"POT-Creation-Date: 2004-06-01 18:18-0300\n"
 "PO-Revision-Date: 2004-04-09 12:51+0200\n"
 "Last-Translator: Bartosz Fenski <fenio@o2.pl>\n"
 "Language-Team: Polish <pddp@debian.linux.org.pl>\n"
@@ -56,17 +56,17 @@ msgstr "B
 msgid "Signal no.%d"
 msgstr "Sygna³ nr %d"
 
-#: lib/database.c:124
+#: lib/database.c:125
 #, c-format
 msgid "couldn't allocate memory for strdup in findpackage(%s)"
 msgstr "nie uda³o siê przydzieliæ pamiêci dla strdup w findpackage(%s)"
 
-#: lib/database.c:194
+#: lib/database.c:195
 #, c-format
 msgid "size %7d occurs %5d times\n"
 msgstr "rozmiar %7d pojawi³ siê %5d razy\n"
 
-#: lib/database.c:195
+#: lib/database.c:196
 msgid "failed write during hashreport"
 msgstr "b³ad zapisu podczas wykonania funkcji hashreport"
 
@@ -756,41 +756,37 @@ msgstr "nie mo
 msgid "must start with an alphanumeric"
 msgstr "musi siê znaczynaæ od litery lub cyfry"
 
-#: lib/parsehelp.c:115
-msgid "must be at least two characters"
-msgstr "musi mieæ co najmniej dwa znaki"
-
-#: lib/parsehelp.c:124
+#: lib/parsehelp.c:123
 #, c-format
 msgid "character `%c' not allowed - only letters, digits and %s allowed"
 msgstr "znak `%c' jest niedozwolony - mo¿na u¿yæ jedynie liter, cyfr i %s"
 
-#: lib/parsehelp.c:179
+#: lib/parsehelp.c:178
 msgid "<none>"
 msgstr "<brak>"
 
-#: lib/parsehelp.c:194
+#: lib/parsehelp.c:193
 msgid "version string is empty"
 msgstr "ci±g znaków dla numeru wersji jest pusty"
 
-#: lib/parsehelp.c:205
+#: lib/parsehelp.c:204
 msgid "version string has embedded spaces"
 msgstr "ci±g znaków dla numeru wersji zawiera spacje"
 
-#: lib/parsehelp.c:210
+#: lib/parsehelp.c:209
 msgid "epoch in version is not number"
 msgstr "epoka w numerze wersji nie jest liczb±"
 
-#: lib/parsehelp.c:211
+#: lib/parsehelp.c:210
 msgid "nothing after colon in version number"
 msgstr "brak znaków po dwukropku w numerze wersji"
 
-#: lib/parsehelp.c:233
+#: lib/parsehelp.c:232
 #, c-format
 msgid "missing %s"
 msgstr "brakuj±cy %s"
 
-#: lib/parsehelp.c:237
+#: lib/parsehelp.c:236
 #, c-format
 msgid "empty value for %s"
 msgstr "brak warto¶ci dla %s"
@@ -1488,87 +1484,87 @@ msgstr "b
 msgid "EOF on stdin at conffile prompt"
 msgstr "EOF ze stdin wprowadzony ze znaku zachêty"
 
-#: main/depcon.c:74
+#: main/depcon.c:76
 #, c-format
 msgid "unable to check for existence of `%.250s'"
 msgstr "nie mo¿na sprawdziæ istnienia `%.250s'"
 
-#: main/depcon.c:134 main/packages.c:386
+#: main/depcon.c:153 main/packages.c:389
 msgid " depends on "
 msgstr " zale¿y od "
 
-#: main/depcon.c:135
+#: main/depcon.c:154
 msgid " pre-depends on "
 msgstr " zale¿y-przed od "
 
-#: main/depcon.c:136
+#: main/depcon.c:155
 msgid " recommends "
 msgstr " poleca "
 
-#: main/depcon.c:137
+#: main/depcon.c:156
 msgid " conflicts with "
 msgstr " w konflikcie z "
 
-#: main/depcon.c:138
+#: main/depcon.c:157
 msgid " suggests "
 msgstr " sugeruje "
 
-#: main/depcon.c:139
+#: main/depcon.c:158
 msgid " enhances "
 msgstr " rozszerza "
 
-#: main/depcon.c:215
+#: main/depcon.c:234
 #, c-format
 msgid "  %.250s is to be removed.\n"
 msgstr "  %.250s jest przeznaczony do usuniêcia.\n"
 
-#: main/depcon.c:218
+#: main/depcon.c:237
 #, c-format
 msgid "  %.250s is to be deconfigured.\n"
 msgstr "  %.250s jest przeznaczony do zdekonfigurowania.\n"
 
-#: main/depcon.c:222
+#: main/depcon.c:241
 #, c-format
 msgid "  %.250s is to be installed, but is version %.250s.\n"
 msgstr "  %.250s jest przeznaczony do zainstalowania, ale w wersji %.250s.\n"
 
-#: main/depcon.c:230
+#: main/depcon.c:249
 #, c-format
 msgid "  %.250s is installed, but is version %.250s.\n"
 msgstr "  %.250s jest zainstalowany, ale w wersji %.250s.\n"
 
-#: main/depcon.c:245
+#: main/depcon.c:264
 #, c-format
 msgid "  %.250s is unpacked, but has never been configured.\n"
 msgstr "  %.250s jest rozpakowany, ale nie by³ jeszcze skonfigurowany.\n"
 
-#: main/depcon.c:249
+#: main/depcon.c:268
 #, c-format
 msgid "  %.250s is unpacked, but is version %.250s.\n"
 msgstr "  %.250s jest rozpakowany, ale w wersji %.250s.\n"
 
-#: main/depcon.c:255
+#: main/depcon.c:274
 #, c-format
 msgid "  %.250s latest configured version is %.250s.\n"
 msgstr "  %.250s ma skonfigurowan± wersjê %.250s.\n"
 
-#: main/depcon.c:264
+#: main/depcon.c:283
 #, c-format
 msgid "  %.250s is %s.\n"
 msgstr "  %.250s jest %s.\n"
 
-#: main/depcon.c:300
+#: main/depcon.c:319
 #, c-format
 msgid "  %.250s provides %.250s but is to be removed.\n"
 msgstr "  %.250s dostarcza %.250s ale jest przeznaczony do usuniêcia.\n"
 
-#: main/depcon.c:304
+#: main/depcon.c:323
 #, c-format
 msgid "  %.250s provides %.250s but is to be deconfigured.\n"
 msgstr ""
 "  %.250s dostarcza %.250s ale jest przeznaczony do zdekonfigurowania.\n"
 
-#: main/depcon.c:309
+#: main/depcon.c:328
 #, c-format
 msgid "  %.250s provides %.250s but is %s.\n"
 msgstr "  %.250s dostarcza %.250s ale jest %s.\n"
@@ -1576,28 +1572,28 @@ msgstr "  %.250s dostarcza %.250s ale jest %s.\n"
 #. If the package wasn't installed at all, and we haven't said
 #. * yet why this isn't satisfied, we should say so now.
 #.
-#: main/depcon.c:323
+#: main/depcon.c:342
 #, c-format
 msgid "  %.250s is not installed.\n"
 msgstr "  %.250s nie jest zainstalowany.\n"
 
-#: main/depcon.c:354
+#: main/depcon.c:373
 #, c-format
 msgid "  %.250s (version %.250s) is to be installed.\n"
 msgstr "  %.250s (wersja %.250s) jest przeznaczony do zainstalowania.\n"
 
-#: main/depcon.c:368
+#: main/depcon.c:387
 #, c-format
 msgid "  %.250s (version %.250s) is %s.\n"
 msgstr "  %.250s (wersja %.250s) jest %s.\n"
 
 #. conflicts and provides the same
-#: main/depcon.c:393
+#: main/depcon.c:412
 #, c-format
 msgid "  %.250s provides %.250s and is to be installed.\n"
 msgstr "  %.250s dostarcza %.250s i jest przeznaczony do zainstalowania.\n"
 
-#: main/depcon.c:424
+#: main/depcon.c:443
 #, c-format
 msgid "  %.250s provides %.250s and is %s.\n"
 msgstr "  %.250s dostarcza %.250s i jest %s.\n"
@@ -2126,7 +2122,7 @@ msgid " --licence for copyright and license details.\n"
 msgstr " --licence informacje o prawach autorskich i licencji.\n"
 
 #: main/main.c:58
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "Usage: \n"
 "  dpkg -i|--install      <.deb file name> ... | -R|--recursive <dir> ...\n"
@@ -2188,11 +2184,11 @@ msgid ""
 "  --abort-after <n>              Abort after encountering <n> errors\n"
 "\n"
 "Comparison operators for --compare-versions are:\n"
-" lt le eq ne ge gt       (treat no version as earlier than any version);\n"
-" lt-nl le-nl ge-nl gt-nl (treat no version as later than any version);\n"
+" lt le eq ne ge gt       (treat empty version as earlier than any version);\n"
+" lt-nl le-nl ge-nl gt-nl (treat empty version as later than any version);\n"
 " < << <= = >= >> >       (only for compatibility with control file syntax).\n"
 "\n"
-"Use `dselect' 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"
@@ -2290,7 +2286,7 @@ msgstr ""
 "\n"
 "Opcje oznaczone [*] podaj± du¿o tre¶ci - skieruj potok na `less' lub `more' !"
 
-#: main/main.c:185 main/query.c:506 dpkg-deb/main.c:157 split/main.c:144
+#: main/main.c:185 main/query.c:506 dpkg-deb/main.c:157 split/main.c:146
 #, c-format
 msgid "conflicting actions --%s and --%s"
 msgstr "konflikt miêdzy dzia³aniem --%s i --%s"
@@ -2477,7 +2473,7 @@ msgid "unexpected eof before end of line %d"
 msgstr "niespodziewany EOF przed koñcem linii %d"
 
 #: main/main.c:540 main/main.c:555 main/query.c:541 dpkg-deb/main.c:169
-#: split/main.c:157
+#: split/main.c:159
 msgid "need an action option"
 msgstr "nale¿y okre¶liæ dzia³anie"
 
@@ -2514,43 +2510,43 @@ msgstr ""
 "Rozpakowana zosta³a wiêcej ni¿ jedna kopia pakietu %s\n"
 " w tym przebiegu !  Konfiguracja odbêdzie siê tylko dla jednej.\n"
 
-#: main/packages.c:264 main/packages.c:308 main/packages.c:321
+#: main/packages.c:267 main/packages.c:311 main/packages.c:324
 msgid "  Package "
 msgstr "  Pakiet "
 
-#: main/packages.c:267 main/packages.c:311 main/packages.c:324
+#: main/packages.c:270 main/packages.c:314 main/packages.c:327
 msgid " which provides "
 msgstr " który dostarcza "
 
-#: main/packages.c:270
+#: main/packages.c:273
 msgid " is to be removed.\n"
 msgstr " jest przeznaczony do usuniêcia.\n"
 
-#: main/packages.c:282
+#: main/packages.c:285
 msgid "  Version of "
 msgstr "  Wersja "
 
-#: main/packages.c:284
+#: main/packages.c:287
 msgid " on system is "
 msgstr " w systemie to "
 
-#: main/packages.c:304
+#: main/packages.c:307
 #, c-format
 msgid "dpkg: also configuring `%s' (required by `%s')\n"
 msgstr "dpkg: konfiguracja tak¿e dla `%s' (wymagana przez `%s')\n"
 
-#: main/packages.c:314
+#: main/packages.c:317
 msgid " is not configured yet.\n"
 msgstr " nie jest jeszcze skonfigurowany.\n"
 
-#: main/packages.c:327
+#: main/packages.c:330
 msgid " is not installed.\n"
 msgstr " nie jest zainstalowany.\n"
 
 #. Don't print the line about the package to be removed if
 #. * that's the only line.
 #.
-#: main/packages.c:392
+#: main/packages.c:395
 msgid "; however:\n"
 msgstr "; jednak¿e:\n"
 
@@ -3506,10 +3502,10 @@ msgid "archive has malformatted ctrl len `%s'"
 msgstr "archiwum ma uszkodzon± d³ugo¶æ kontroln± `%s'"
 
 #: dpkg-deb/extract.c:193
-#, c-format
+#, fuzzy, c-format
 msgid ""
 " old debian package, version %s.\n"
-" size %ld bytes: control archive= %ld, main archive= %zi.\n"
+" size %ld bytes: control archive= %zi, main archive= %ld.\n"
 msgstr ""
 " poprzedni pakiet debiana, wersja %s.\n"
 " rozmiar %ld bajtów: archiwum kontrolne= %ld, archiwum z danymi= %zi.\n"
@@ -3912,7 +3908,7 @@ msgid "file `%.250s' is not an archive part"
 msgstr "plik `%.250s' nie jest czê¶ci± archiwum"
 
 #: split/info.c:188
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "%s:\n"
 "    Part format version:            %s\n"
@@ -3922,9 +3918,9 @@ msgid ""
 "        ... length:                 %lu bytes\n"
 "        ... split every:            %lu bytes\n"
 "    Part number:                    %d/%d\n"
-"    Part length:                    %lu bytes\n"
+"    Part length:                    %zi bytes\n"
 "    Part offset:                    %lu bytes\n"
-"    Part file size (used portion):  %zi bytes\n"
+"    Part file size (used portion):  %lu bytes\n"
 "\n"
 msgstr ""
 "%s:\n"
@@ -3986,13 +3982,13 @@ msgstr ""
 msgid "part %d is missing"
 msgstr "brakuje czê¶ci %d"
 
-#: split/main.c:38
+#: split/main.c:40
 msgid "Debian GNU/Linux `dpkg-split' package split/join tool; version "
 msgstr ""
 "Debian GNU/Linux `dpkg-split', program do dzielenia/³±czenia pakietów, "
 "wersja "
 
-#: split/main.c:40
+#: split/main.c:42
 msgid ""
 "Copyright (C) 1994-1996 Ian Jackson.  This is free software; see the\n"
 "GNU General Public Licence version 2 or later for copying conditions.\n"
@@ -4004,7 +4000,7 @@ msgstr ""
 "lub której¶ z pó¼niejszych wersji. Brak JAKIEJKOLWIEK gwarancji.\n"
 "Wiêcej szczegó³ów zobacz w dpkg-split --licence.\n"
 
-#: split/main.c:47
+#: split/main.c:49
 #, c-format
 msgid ""
 "Usage: dpkg-split -s|--split <file> [<prefix>]     Split an archive.\n"
@@ -4050,30 +4046,30 @@ msgstr ""
 "\n"
 "Kod powrotu: 0 = OK;  1 = -a nie jest czê¶ci±;  2 = problem!\n"
 
-#: split/main.c:68
+#: split/main.c:70
 msgid "Type dpkg-split --help for help."
 msgstr "Wpisz dpkg-split --help aby otrzymaæ pomoc."
 
-#: split/main.c:78
+#: split/main.c:80
 #, c-format
 msgid "error reading %s"
 msgstr "b³±d odczytu %s"
 
-#: split/main.c:82
+#: split/main.c:84
 #, c-format
 msgid "error reading %.250s"
 msgstr "b³±d odczytu %.250s"
 
-#: split/main.c:83
+#: split/main.c:85
 #, c-format
 msgid "unexpected end of file in %.250s"
 msgstr "niespodziewany koniec pliku dla %.250s"
 
-#: split/main.c:103
+#: split/main.c:105
 msgid "part size is far too large or is not positive"
 msgstr "rozmiar czê¶ci jest za du¿y lub jest liczb± ujemn±"
 
-#: split/main.c:107
+#: split/main.c:109
 #, c-format
 msgid "part size must be at least %dk (to allow for header)"
 msgstr "rozmiar czê¶ci musi mieæ co najmniej %dk"
@@ -4249,37 +4245,37 @@ msgstr "plik MD"
 msgid "%s: unrecognized line\n"
 msgstr "%s: nierozpoznana linia\n"
 
-#: utils/md5sum.c:284
+#: utils/md5sum.c:292
 #, c-format
 msgid "%s: can't open %s\n"
 msgstr "%s: nie mo¿na otworzyæ %s\n"
 
-#: utils/md5sum.c:288
+#: utils/md5sum.c:296
 #, c-format
 msgid "%s: error reading %s\n"
 msgstr "%s: b³±d odczytu %s\n"
 
-#: utils/md5sum.c:294
+#: utils/md5sum.c:302
 #, c-format
 msgid "FAILED\n"
 msgstr "B£¡D\n"
 
-#: utils/md5sum.c:296
+#: utils/md5sum.c:304
 #, c-format
 msgid "%s: MD5 check failed for '%s'\n"
 msgstr "%s: b³êdny skrót MD5 dla '%s'\n"
 
-#: utils/md5sum.c:299
+#: utils/md5sum.c:307
 #, c-format
 msgid "OK\n"
 msgstr "OK\n"
 
-#: utils/md5sum.c:303
+#: utils/md5sum.c:311
 #, c-format
 msgid "%s: %d of %d file(s) failed MD5 check\n"
 msgstr "%s: %d z %d plik(ów) ma b³êdny skrót MD5\n"
 
-#: utils/md5sum.c:305
+#: utils/md5sum.c:313
 #, c-format
 msgid "%s: no files checked\n"
 msgstr "%s: nie sprawdzono ¿adnych plików\n"
@@ -5350,9 +5346,10 @@ msgid " verbose:v help:?"
 msgstr " szczegó³y:v pomoc:?"
 
 #: dselect/pkginfo.cc:82
+#, fuzzy
 msgid ""
 "The line you have highlighted represents many packages; if you ask to "
-"install, remove, hold, &c it you will affect all the packages which match "
+"install, remove, hold, etc. it you will affect all the packages which match "
 "the criterion shown.\n"
 "\n"
 "If you move the highlight to a line for a particular package you will see "
@@ -5508,9 +5505,10 @@ msgid "Keystrokes"
 msgstr "Spis klawiszy"
 
 #: dselect/helpmsgs.cc:8
+#, fuzzy
 msgid ""
 "Motion keys: Next/Previous, Top/End, Up/Down, Backwards/Forwards:\n"
-"  n, Down-arrow, j      p, Up-arrow, k          move highlight\n"
+"  Down-arrow, j         Up-arrow, k             move highlight\n"
 "  N, Page-down, Space   P, Page-up, Backspace   scroll list by 1 page\n"
 "  ^n                    ^p                      scroll list by 1 line\n"
 "  t, Home               e, End                  jump to top/end of list\n"
@@ -5536,7 +5534,7 @@ msgid ""
 "   R     Revert to state before this list      ^l   redraw display\n"
 "   U     set all to sUggested state             /   search (Return to "
 "cancel)\n"
-"   D     set all to Directly requested state    \\   repeat last search\n"
+"   D     set all to Directly requested state  n, \\  repeat last search\n"
 msgstr ""
 "Klawisze ruchu: Natêpny/Poprzedni, Góra/Dó³, Do góry/W dó³:\n"
 "  n, Strza³ka-w-dó³     p, Strza³ka-do-góry     ruch kursora\n"
@@ -5961,3 +5959,6 @@ msgstr ""
 " ^l                od¶wie¿enie ekranu\n"
 "  /                szukaj (return - anuluj)\n"
 "  \\                powtórz ostatnie szukanie\n"
+
+#~ msgid "must be at least two characters"
+#~ msgstr "musi mieæ co najmniej dwa znaki"

po/pt.po

@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dpkg 1.14\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-04-25 18:54+0100\n"
+"POT-Creation-Date: 2004-06-01 18:18-0300\n"
 "PO-Revision-Date: 2004-02-13 15:55+0000\n"
 "Last-Translator: Miguel Figueiredo <elmig@debianpt.org>\n"
 "Language-Team: Portuguese <traduz@debianpt.org>\n"
@@ -56,17 +56,17 @@ msgstr "Erro de sistema num.%d"
 msgid "Signal no.%d"
 msgstr "Sinal num.%d"
 
-#: lib/database.c:124
+#: lib/database.c:125
 #, c-format
 msgid "couldn't allocate memory for strdup in findpackage(%s)"
 msgstr "não conseguiu alocar memória para strdup em findpackage(%s)"
 
-#: lib/database.c:194
+#: lib/database.c:195
 #, c-format
 msgid "size %7d occurs %5d times\n"
 msgstr "tamanho %7d ocorre %5d vezes\n"
 
-#: lib/database.c:195
+#: lib/database.c:196
 msgid "failed write during hashreport"
 msgstr "falhou a escrita durante hashreport"
 
@@ -751,42 +751,38 @@ msgstr "não pode ser uma string vazia"
 msgid "must start with an alphanumeric"
 msgstr "tem de começar por um alfanumérico"
 
-#: lib/parsehelp.c:115
-msgid "must be at least two characters"
-msgstr "tem de ter pelo menos dois caracteres"
-
-#: lib/parsehelp.c:124
+#: lib/parsehelp.c:123
 #, c-format
 msgid "character `%c' not allowed - only letters, digits and %s allowed"
 msgstr ""
 "caractere `%c' não é permitido - apenas letras, dígitos e %s são permitidos"
 
-#: lib/parsehelp.c:179
+#: lib/parsehelp.c:178
 msgid "<none>"
 msgstr "<nenhum>"
 
-#: lib/parsehelp.c:194
+#: lib/parsehelp.c:193
 msgid "version string is empty"
 msgstr "string de versão está vazia"
 
-#: lib/parsehelp.c:205
+#: lib/parsehelp.c:204
 msgid "version string has embedded spaces"
 msgstr "string de versão contém espaços"
 
-#: lib/parsehelp.c:210
+#: lib/parsehelp.c:209
 msgid "epoch in version is not number"
 msgstr "época na versão não é um número"
 
-#: lib/parsehelp.c:211
+#: lib/parsehelp.c:210
 msgid "nothing after colon in version number"
 msgstr "nada após dois pontos no número de versão"
 
-#: lib/parsehelp.c:233
+#: lib/parsehelp.c:232
 #, c-format
 msgid "missing %s"
 msgstr "falta %s"
 
-#: lib/parsehelp.c:237
+#: lib/parsehelp.c:236
 #, c-format
 msgid "empty value for %s"
 msgstr "valor vazio para %s"
@@ -1488,86 +1484,86 @@ msgstr "erro de leitura em stdin na prompt do ficheiro de configuração"
 msgid "EOF on stdin at conffile prompt"
 msgstr "EOF em stdin na prompt do ficheiro de configuração"
 
-#: main/depcon.c:74
+#: main/depcon.c:76
 #, c-format
 msgid "unable to check for existence of `%.250s'"
 msgstr "não foi possível verificar a existência de `%.250s'"
 
-#: main/depcon.c:134 main/packages.c:386
+#: main/depcon.c:153 main/packages.c:389
 msgid " depends on "
 msgstr " depende de "
 
-#: main/depcon.c:135
+#: main/depcon.c:154
 msgid " pre-depends on "
 msgstr " pre-depende de "
 
-#: main/depcon.c:136
+#: main/depcon.c:155
 msgid " recommends "
 msgstr " recomenda "
 
-#: main/depcon.c:137
+#: main/depcon.c:156
 msgid " conflicts with "
 msgstr " em conflito com "
 
-#: main/depcon.c:138
+#: main/depcon.c:157
 msgid " suggests "
 msgstr " sugere "
 
-#: main/depcon.c:139
+#: main/depcon.c:158
 msgid " enhances "
 msgstr " melhora "
 
-#: main/depcon.c:215
+#: main/depcon.c:234
 #, c-format
 msgid "  %.250s is to be removed.\n"
 msgstr "  %.250s vai ser removido.\n"
 
-#: main/depcon.c:218
+#: main/depcon.c:237
 #, c-format
 msgid "  %.250s is to be deconfigured.\n"
 msgstr "  %.250s vai ser desconfigurado.\n"
 
-#: main/depcon.c:222
+#: main/depcon.c:241
 #, c-format
 msgid "  %.250s is to be installed, but is version %.250s.\n"
 msgstr "  %.250s vai ser instalado, mas é versão %.250s.\n"
 
-#: main/depcon.c:230
+#: main/depcon.c:249
 #, c-format
 msgid "  %.250s is installed, but is version %.250s.\n"
 msgstr "  %.250s está instalado, mas é versão %.250s.\n"
 
-#: main/depcon.c:245
+#: main/depcon.c:264
 #, c-format
 msgid "  %.250s is unpacked, but has never been configured.\n"
 msgstr " %.250s está descompactado, mas nunca foi configurado.\n"
 
-#: main/depcon.c:249
+#: main/depcon.c:268
 #, c-format
 msgid "  %.250s is unpacked, but is version %.250s.\n"
 msgstr "  %.250s está descompactado, mas é versão %.250s.\n"
 
-#: main/depcon.c:255
+#: main/depcon.c:274
 #, c-format
 msgid "  %.250s latest configured version is %.250s.\n"
 msgstr "  %.250s a última versão configurada é %.250s.\n"
 
-#: main/depcon.c:264
+#: main/depcon.c:283
 #, c-format
 msgid "  %.250s is %s.\n"
 msgstr "  %.250s é %s.\n"
 
-#: main/depcon.c:300
+#: main/depcon.c:319
 #, c-format
 msgid "  %.250s provides %.250s but is to be removed.\n"
 msgstr "  %.250s disponibiliza %.250s mas vai ser removido.\n"
 
-#: main/depcon.c:304
+#: main/depcon.c:323
 #, c-format
 msgid "  %.250s provides %.250s but is to be deconfigured.\n"
 msgstr "  %.250s disponibiliza %.250s mas vai ser desconfigurado.\n"
 
-#: main/depcon.c:309
+#: main/depcon.c:328
 #, c-format
 msgid "  %.250s provides %.250s but is %s.\n"
 msgstr "  %.250s disponibiliza %.250s mas é %s.\n"
@@ -1575,28 +1571,28 @@ msgstr "  %.250s disponibiliza %.250s mas é %s.\n"
 #. If the package wasn't installed at all, and we haven't said
 #. * yet why this isn't satisfied, we should say so now.
 #.
-#: main/depcon.c:323
+#: main/depcon.c:342
 #, c-format
 msgid "  %.250s is not installed.\n"
 msgstr "  %.250s não está instalado.\n"
 
-#: main/depcon.c:354
+#: main/depcon.c:373
 #, c-format
 msgid "  %.250s (version %.250s) is to be installed.\n"
 msgstr "  %.250s (versão %.250s) vai ser instalado.\n"
 
-#: main/depcon.c:368
+#: main/depcon.c:387
 #, c-format
 msgid "  %.250s (version %.250s) is %s.\n"
 msgstr "  %.250s (versão %.250s) é %s.\n"
 
 #. conflicts and provides the same
-#: main/depcon.c:393
+#: main/depcon.c:412
 #, c-format
 msgid "  %.250s provides %.250s and is to be installed.\n"
 msgstr "  %.250s disponibiliza %.250s e vai ser instalado.\n"
 
-#: main/depcon.c:424
+#: main/depcon.c:443
 #, c-format
 msgid "  %.250s provides %.250s and is %s.\n"
 msgstr "  %.250s disponibiliza %.250s e é %s.\n"
@@ -2196,11 +2192,11 @@ msgid ""
 "  --abort-after <n>              Abort after encountering <n> errors\n"
 "\n"
 "Comparison operators for --compare-versions are:\n"
-" lt le eq ne ge gt       (treat no version as earlier than any version);\n"
-" lt-nl le-nl ge-nl gt-nl (treat no version as later than any version);\n"
+" lt le eq ne ge gt       (treat empty version as earlier than any version);\n"
+" lt-nl le-nl ge-nl gt-nl (treat empty version as later than any version);\n"
 " < << <= = >= >> >       (only for compatibility with control file syntax).\n"
 "\n"
-"Use `dselect' 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 "
@@ -2314,7 +2310,7 @@ msgstr ""
 "Opções marcadas com [*] produzem muita saída de texto - utilize pipes com "
 "`less' ou `more' !"
 
-#: main/main.c:185 main/query.c:506 dpkg-deb/main.c:157 split/main.c:144
+#: main/main.c:185 main/query.c:506 dpkg-deb/main.c:157 split/main.c:146
 #, c-format
 msgid "conflicting actions --%s and --%s"
 msgstr "acções em conflito --%s e --%s"
@@ -2514,7 +2510,7 @@ msgid "unexpected eof before end of line %d"
 msgstr "eof inesperado antes do fim da linha %d"
 
 #: main/main.c:540 main/main.c:555 main/query.c:541 dpkg-deb/main.c:169
-#: split/main.c:157
+#: split/main.c:159
 msgid "need an action option"
 msgstr "é necessária uma opção de acção"
 
@@ -2550,43 +2546,43 @@ msgstr ""
 "Foi descompactada mais que uma cópia do pacote %s\n"
 " nesta execução !  Apenas configurando uma vez.\n"
 
-#: main/packages.c:264 main/packages.c:308 main/packages.c:321
+#: main/packages.c:267 main/packages.c:311 main/packages.c:324
 msgid "  Package "
 msgstr "  Pacote "
 
-#: main/packages.c:267 main/packages.c:311 main/packages.c:324
+#: main/packages.c:270 main/packages.c:314 main/packages.c:327
 msgid " which provides "
 msgstr " que disponibiliza "
 
-#: main/packages.c:270
+#: main/packages.c:273
 msgid " is to be removed.\n"
 msgstr " está para ser removido.\n"
 
-#: main/packages.c:282
+#: main/packages.c:285
 msgid "  Version of "
 msgstr "  Versão de "
 
-#: main/packages.c:284
+#: main/packages.c:287
 msgid " on system is "
 msgstr " no sistema é "
 
-#: main/packages.c:304
+#: main/packages.c:307
 #, c-format
 msgid "dpkg: also configuring `%s' (required by `%s')\n"
 msgstr "dpkg: também configurando `%s' (requerido por `%s')\n"
 
-#: main/packages.c:314
+#: main/packages.c:317
 msgid " is not configured yet.\n"
 msgstr " ainda não está configurado.\n"
 
-#: main/packages.c:327
+#: main/packages.c:330
 msgid " is not installed.\n"
 msgstr " não está instalado.\n"
 
 #. Don't print the line about the package to be removed if
 #. * that's the only line.
 #.
-#: main/packages.c:392
+#: main/packages.c:395
 msgid "; however:\n"
 msgstr "; no entanto:\n"
 
@@ -3563,10 +3559,10 @@ msgid "archive has malformatted ctrl len `%s'"
 msgstr "o arquivo tem ctrl len mal formado `%s'"
 
 #: dpkg-deb/extract.c:193
-#, c-format
+#, fuzzy, c-format
 msgid ""
 " old debian package, version %s.\n"
-" size %ld bytes: control archive= %ld, main archive= %zi.\n"
+" size %ld bytes: control archive= %zi, main archive= %ld.\n"
 msgstr ""
 " pacote debian antigo, versão %s,\n"
 " tamanho %ld bytes: arquiv de controle= %ld, arquivo principal= %zi.\n"
@@ -3973,7 +3969,7 @@ msgid "file `%.250s' is not an archive part"
 msgstr "o ficheiro `%250s' não é uma parte de arquivo"
 
 #: split/info.c:188
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "%s:\n"
 "    Part format version:            %s\n"
@@ -3983,9 +3979,9 @@ msgid ""
 "        ... length:                 %lu bytes\n"
 "        ... split every:            %lu bytes\n"
 "    Part number:                    %d/%d\n"
-"    Part length:                    %lu bytes\n"
+"    Part length:                    %zi bytes\n"
 "    Part offset:                    %lu bytes\n"
-"    Part file size (used portion):  %zi bytes\n"
+"    Part file size (used portion):  %lu bytes\n"
 "\n"
 msgstr ""
 "%s:\n"
@@ -4044,12 +4040,12 @@ msgstr "--join necessita de um ou mais partes de ficheiro como argumento"
 msgid "part %d is missing"
 msgstr "falta a parte %d"
 
-#: split/main.c:38
+#: split/main.c:40
 msgid "Debian GNU/Linux `dpkg-split' package split/join tool; version "
 msgstr ""
 "Pacote Debian GNU/Linux `dpkg-split' ferramenta de dividir/juntar; versão "
 
-#: split/main.c:40
+#: split/main.c:42
 msgid ""
 "Copyright (C) 1994-1996 Ian Jackson.  This is free software; see the\n"
 "GNU General Public Licence version 2 or later for copying conditions.\n"
@@ -4059,7 +4055,7 @@ msgstr ""
 "GNU General Public Licence versão 2 ou posterior para condições de cópia.\n"
 "NÃO existe garantia.  Veja dpkg-split --licence para detalhes.\n"
 
-#: split/main.c:47
+#: split/main.c:49
 #, c-format
 msgid ""
 "Usage: dpkg-split -s|--split <file> [<prefix>]     Split an archive.\n"
@@ -4104,30 +4100,30 @@ msgstr ""
 "\n"
 "Estado de saída: 0 = OK; 1 = -a não é uma parte; 2 = problema!\n"
 
-#: split/main.c:68
+#: split/main.c:70
 msgid "Type dpkg-split --help for help."
 msgstr "Escreva dpkg-split --help para ajuda."
 
-#: split/main.c:78
+#: split/main.c:80
 #, c-format
 msgid "error reading %s"
 msgstr "erro lendo %s"
 
-#: split/main.c:82
+#: split/main.c:84
 #, c-format
 msgid "error reading %.250s"
 msgstr "erro lendo %.250s"
 
-#: split/main.c:83
+#: split/main.c:85
 #, c-format
 msgid "unexpected end of file in %.250s"
 msgstr "fim de ficheiro inesperado em %.250s"
 
-#: split/main.c:103
+#: split/main.c:105
 msgid "part size is far too large or is not positive"
 msgstr "o tamanho da parte ou é muito grande ou não é positivo"
 
-#: split/main.c:107
+#: split/main.c:109
 #, c-format
 msgid "part size must be at least %dk (to allow for header)"
 msgstr ""
@@ -4303,37 +4299,37 @@ msgstr "mdfile"
 msgid "%s: unrecognized line\n"
 msgstr "%s: linha não reconhecida: %s"
 
-#: utils/md5sum.c:284
+#: utils/md5sum.c:292
 #, c-format
 msgid "%s: can't open %s\n"
 msgstr "%s: não pode abrir %s\n"
 
-#: utils/md5sum.c:288
+#: utils/md5sum.c:296
 #, c-format
 msgid "%s: error reading %s\n"
 msgstr "%s: erro lendo %s\n"
 
-#: utils/md5sum.c:294
+#: utils/md5sum.c:302
 #, c-format
 msgid "FAILED\n"
 msgstr "FALHOU\n"
 
-#: utils/md5sum.c:296
+#: utils/md5sum.c:304
 #, c-format
 msgid "%s: MD5 check failed for '%s'\n"
 msgstr "%s: a verificação MD5 falhou para '%s'\n"
 
-#: utils/md5sum.c:299
+#: utils/md5sum.c:307
 #, c-format
 msgid "OK\n"
 msgstr "OK\n"
 
-#: utils/md5sum.c:303
+#: utils/md5sum.c:311
 #, c-format
 msgid "%s: %d of %d file(s) failed MD5 check\n"
 msgstr "%s: %d de %d ficheiro(s) falharam a verificação MD5\n"
 
-#: utils/md5sum.c:305
+#: utils/md5sum.c:313
 #, c-format
 msgid "%s: no files checked\n"
 msgstr "%s: não foram verificados ficheiros\n"
@@ -5404,9 +5400,10 @@ msgid " verbose:v help:?"
 msgstr " detalhe:v ajuda:?"
 
 #: dselect/pkginfo.cc:82
+#, fuzzy
 msgid ""
 "The line you have highlighted represents many packages; if you ask to "
-"install, remove, hold, &c it you will affect all the packages which match "
+"install, remove, hold, etc. it you will affect all the packages which match "
 "the criterion shown.\n"
 "\n"
 "If you move the highlight to a line for a particular package you will see "
@@ -5562,9 +5559,10 @@ msgid "Keystrokes"
 msgstr "Combinações de teclas"
 
 #: dselect/helpmsgs.cc:8
+#, fuzzy
 msgid ""
 "Motion keys: Next/Previous, Top/End, Up/Down, Backwards/Forwards:\n"
-"  n, Down-arrow, j      p, Up-arrow, k          move highlight\n"
+"  Down-arrow, j         Up-arrow, k             move highlight\n"
 "  N, Page-down, Space   P, Page-up, Backspace   scroll list by 1 page\n"
 "  ^n                    ^p                      scroll list by 1 line\n"
 "  t, Home               e, End                  jump to top/end of list\n"
@@ -5590,7 +5588,7 @@ msgid ""
 "   R     Revert to state before this list      ^l   redraw display\n"
 "   U     set all to sUggested state             /   search (Return to "
 "cancel)\n"
-"   D     set all to Directly requested state    \\   repeat last search\n"
+"   D     set all to Directly requested state  n, \\  repeat last search\n"
 msgstr ""
 "Teclas de movimentação: Próx./Anterior, Topo/Final, Cima/Baixo, Trás/"
 "Frente:\n"
@@ -6019,6 +6017,9 @@ msgstr ""
 "  /               procurar (enter para cancelar procura)\n"
 "  \\               repetir última busca\n"
 
+#~ msgid "must be at least two characters"
+#~ msgstr "tem de ter pelo menos dois caracteres"
+
 #~ msgid "no gcc-lib component"
 #~ msgstr "sem component gcc-lib"
 

po/pt_BR.po

@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dpkg 1.10.20\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-04-25 18:54+0100\n"
+"POT-Creation-Date: 2004-06-01 18:18-0300\n"
 "PO-Revision-Date: 2004-03-13 14:44-0300\n"
 "Last-Translator: André Luís Lopes <andrelop@ig.com.br>\n"
 "Language-Team: Debian-BR l10n Team <debian-l10n-portuguese@lists.debian."
@@ -60,17 +60,17 @@ msgstr "Erro do sistema no. %d"
 msgid "Signal no.%d"
 msgstr "Sinal no. %d"
 
-#: lib/database.c:124
+#: lib/database.c:125
 #, c-format
 msgid "couldn't allocate memory for strdup in findpackage(%s)"
 msgstr "n=E3o foi poss=EDvel alocar mem=F3ria para strdup in findpackage(%s)"
 
-#: lib/database.c:194
+#: lib/database.c:195
 #, c-format
 msgid "size %7d occurs %5d times\n"
 msgstr "tamanho %7d ocorre %5d vezes\n"
 
-#: lib/database.c:195
+#: lib/database.c:196
 msgid "failed write during hashreport"
 msgstr "escrita falhou durante hashreport"
 
@@ -767,41 +767,37 @@ msgstr "pode n
 msgid "must start with an alphanumeric"
 msgstr "precisa começar com um alfanumérico"
 
-#: lib/parsehelp.c:115
-msgid "must be at least two characters"
-msgstr "precisa ter ao menos dois caracteres"
-
-#: lib/parsehelp.c:124
+#: lib/parsehelp.c:123
 #, c-format
 msgid "character `%c' not allowed - only letters, digits and %s allowed"
 msgstr "caracter `%c' não permitido - apenas letras, dígitos e %s permitidos"
 
-#: lib/parsehelp.c:179
+#: lib/parsehelp.c:178
 msgid "<none>"
 msgstr "<nenhuma>"
 
-#: lib/parsehelp.c:194
+#: lib/parsehelp.c:193
 msgid "version string is empty"
 msgstr "string de versão está vazia"
 
-#: lib/parsehelp.c:205
+#: lib/parsehelp.c:204
 msgid "version string has embedded spaces"
 msgstr "string de versão possui espaçõs embutidos"
 
-#: lib/parsehelp.c:210
+#: lib/parsehelp.c:209
 msgid "epoch in version is not number"
 msgstr "época em versão não é um número"
 
-#: lib/parsehelp.c:211
+#: lib/parsehelp.c:210
 msgid "nothing after colon in version number"
 msgstr "nada após vírgula em número de versão"
 
-#: lib/parsehelp.c:233
+#: lib/parsehelp.c:232
 #, c-format
 msgid "missing %s"
 msgstr "%s faltando"
 
-#: lib/parsehelp.c:237
+#: lib/parsehelp.c:236
 #, c-format
 msgid "empty value for %s"
 msgstr "valor vazio para %s"
@@ -1499,86 +1495,86 @@ msgstr "erro de leitura em stdin no prompt do conffile"
 msgid "EOF on stdin at conffile prompt"
 msgstr "EOF em stdin no prompt do conffile"
 
-#: main/depcon.c:74
+#: main/depcon.c:76
 #, c-format
 msgid "unable to check for existence of `%.250s'"
 msgstr "não foi possível checar a existência de `%.250s'"
 
-#: main/depcon.c:134 main/packages.c:386
+#: main/depcon.c:153 main/packages.c:389
 msgid " depends on "
 msgstr " depende de "
 
-#: main/depcon.c:135
+#: main/depcon.c:154
 msgid " pre-depends on "
 msgstr " pré-depende de "
 
-#: main/depcon.c:136
+#: main/depcon.c:155
 msgid " recommends "
 msgstr " recomenda "
 
-#: main/depcon.c:137
+#: main/depcon.c:156
 msgid " conflicts with "
 msgstr " conflita com "
 
-#: main/depcon.c:138
+#: main/depcon.c:157
 msgid " suggests "
 msgstr " sugere "
 
-#: main/depcon.c:139
+#: main/depcon.c:158
 msgid " enhances "
 msgstr " aprimora "
 
-#: main/depcon.c:215
+#: main/depcon.c:234
 #, c-format
 msgid "  %.250s is to be removed.\n"
 msgstr "  %.250s está para ser removido.\n"
 
-#: main/depcon.c:218
+#: main/depcon.c:237
 #, c-format
 msgid "  %.250s is to be deconfigured.\n"
 msgstr "  %.250s está para ser desconfigurado.\n"
 
-#: main/depcon.c:222
+#: main/depcon.c:241
 #, c-format
 msgid "  %.250s is to be installed, but is version %.250s.\n"
 msgstr "  %.250s está para ser instalado, mas sua versão é %.250s.\n"
 
-#: main/depcon.c:230
+#: main/depcon.c:249
 #, c-format
 msgid "  %.250s is installed, but is version %.250s.\n"
 msgstr "  %.250s está instalado, mas sua versão é %.250s.\n"
 
-#: main/depcon.c:245
+#: main/depcon.c:264
 #, c-format
 msgid "  %.250s is unpacked, but has never been configured.\n"
 msgstr "  %.250s está descompactado, mas nunca foi configurado.\n"
 
-#: main/depcon.c:249
+#: main/depcon.c:268
 #, c-format
 msgid "  %.250s is unpacked, but is version %.250s.\n"
 msgstr " %.250s está descompactado, mas sua versão é %.250s.\n"
 
-#: main/depcon.c:255
+#: main/depcon.c:274
 #, c-format
 msgid "  %.250s latest configured version is %.250s.\n"
 msgstr "  a versão mais recente configurada de %.250s é %.250s.\n"
 
-#: main/depcon.c:264
+#: main/depcon.c:283
 #, c-format
 msgid "  %.250s is %s.\n"
 msgstr "  %.250s está %s.\n"
 
-#: main/depcon.c:300
+#: main/depcon.c:319
 #, c-format
 msgid "  %.250s provides %.250s but is to be removed.\n"
 msgstr "  %.250s oferece %.250s mas está para ser removido.\n"
 
-#: main/depcon.c:304
+#: main/depcon.c:323
 #, c-format
 msgid "  %.250s provides %.250s but is to be deconfigured.\n"
 msgstr "  %.250s oferece %.250s mas está para ser desconfigurado.\n"
 
-#: main/depcon.c:309
+#: main/depcon.c:328
 #, c-format
 msgid "  %.250s provides %.250s but is %s.\n"
 msgstr "  %.250s oferece %.250s mas está %s.\n"
@@ -1586,28 +1582,28 @@ msgstr "  %.250s oferece %.250s mas est
 #. If the package wasn't installed at all, and we haven't said
 #. * yet why this isn't satisfied, we should say so now.
 #.
-#: main/depcon.c:323
+#: main/depcon.c:342
 #, c-format
 msgid "  %.250s is not installed.\n"
 msgstr "  %.250s não está instalado.\n"
 
-#: main/depcon.c:354
+#: main/depcon.c:373
 #, c-format
 msgid "  %.250s (version %.250s) is to be installed.\n"
 msgstr "  %.250s (versão %.250s) está para ser instalado.\n"
 
-#: main/depcon.c:368
+#: main/depcon.c:387
 #, c-format
 msgid "  %.250s (version %.250s) is %s.\n"
 msgstr "  %.250s (versão %.250s) está %s.\n"
 
 #. conflicts and provides the same
-#: main/depcon.c:393
+#: main/depcon.c:412
 #, c-format
 msgid "  %.250s provides %.250s and is to be installed.\n"
 msgstr "  %.250s oferece %.250s e está para ser instalado.\n"
 
-#: main/depcon.c:424
+#: main/depcon.c:443
 #, c-format
 msgid "  %.250s provides %.250s and is %s.\n"
 msgstr "  %.250s oferece %.250s e está %s.\n"
@@ -2136,7 +2132,7 @@ msgid " --licence for copyright and license details.\n"
 msgstr " --licence para copyright e detalhes de licenciamento.\n"
 
 #: main/main.c:58
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "Usage: \n"
 "  dpkg -i|--install      <.deb file name> ... | -R|--recursive <dir> ...\n"
@@ -2198,11 +2194,11 @@ msgid ""
 "  --abort-after <n>              Abort after encountering <n> errors\n"
 "\n"
 "Comparison operators for --compare-versions are:\n"
-" lt le eq ne ge gt       (treat no version as earlier than any version);\n"
-" lt-nl le-nl ge-nl gt-nl (treat no version as later than any version);\n"
+" lt le eq ne ge gt       (treat empty version as earlier than any version);\n"
+" lt-nl le-nl ge-nl gt-nl (treat empty version as later than any version);\n"
 " < << <= = >= >> >       (only for compatibility with control file syntax).\n"
 "\n"
-"Use `dselect' 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 "
@@ -2315,7 +2311,7 @@ msgstr ""
 "Opções marcadas com [*] produzem muita saída de texto - passe-a por `less' "
 "ou `more' !"
 
-#: main/main.c:185 main/query.c:506 dpkg-deb/main.c:157 split/main.c:144
+#: main/main.c:185 main/query.c:506 dpkg-deb/main.c:157 split/main.c:146
 #, c-format
 msgid "conflicting actions --%s and --%s"
 msgstr "ações conflitantes --%s e --%s"
@@ -2512,7 +2508,7 @@ msgid "unexpected eof before end of line %d"
 msgstr "eof inesperado após fim da linha %d"
 
 #: main/main.c:540 main/main.c:555 main/query.c:541 dpkg-deb/main.c:169
-#: split/main.c:157
+#: split/main.c:159
 msgid "need an action option"
 msgstr "preciso de uma opção de ação"
 
@@ -2548,43 +2544,43 @@ msgstr ""
 "Mais de uma cópia do pacote %s foi descompactada\n"
 " nessa execução ! Configurando-o apenas uma vez.\n"
 
-#: main/packages.c:264 main/packages.c:308 main/packages.c:321
+#: main/packages.c:267 main/packages.c:311 main/packages.c:324
 msgid "  Package "
 msgstr "  Pacote "
 
-#: main/packages.c:267 main/packages.c:311 main/packages.c:324
+#: main/packages.c:270 main/packages.c:314 main/packages.c:327
 msgid " which provides "
 msgstr " que fornece "
 
-#: main/packages.c:270
+#: main/packages.c:273
 msgid " is to be removed.\n"
 msgstr " está para ser removido.\n"
 
-#: main/packages.c:282
+#: main/packages.c:285
 msgid "  Version of "
 msgstr "  Versão de "
 
-#: main/packages.c:284
+#: main/packages.c:287
 msgid " on system is "
 msgstr " no sistema é "
 
-#: main/packages.c:304
+#: main/packages.c:307
 #, c-format
 msgid "dpkg: also configuring `%s' (required by `%s')\n"
 msgstr "dpkg: também configurando `%s' (necessário para `%s')\n"
 
-#: main/packages.c:314
+#: main/packages.c:317
 msgid " is not configured yet.\n"
 msgstr " não está configurado ainda.\n"
 
-#: main/packages.c:327
+#: main/packages.c:330
 msgid " is not installed.\n"
 msgstr " não está instalado.\n"
 
 #. Don't print the line about the package to be removed if
 #. * that's the only line.
 #.
-#: main/packages.c:392
+#: main/packages.c:395
 msgid "; however:\n"
 msgstr "; porém:\n"
 
@@ -3570,10 +3566,10 @@ msgid "archive has malformatted ctrl len `%s'"
 msgstr "arquivo possui len de ctrl malformado `%s'"
 
 #: dpkg-deb/extract.c:193
-#, c-format
+#, fuzzy, c-format
 msgid ""
 " old debian package, version %s.\n"
-" size %ld bytes: control archive= %ld, main archive= %zi.\n"
+" size %ld bytes: control archive= %zi, main archive= %ld.\n"
 msgstr ""
 " antigo pacote debian , versão %s.\n"
 " tamanho %ld bytes: arquivo de controle= %ld, arquivo main= %zi.\n"
@@ -3980,7 +3976,7 @@ msgid "file `%.250s' is not an archive part"
 msgstr "arquivo `%.250s' não é um arquivo part"
 
 #: split/info.c:188
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "%s:\n"
 "    Part format version:            %s\n"
@@ -3990,9 +3986,9 @@ msgid ""
 "        ... length:                 %lu bytes\n"
 "        ... split every:            %lu bytes\n"
 "    Part number:                    %d/%d\n"
-"    Part length:                    %lu bytes\n"
+"    Part length:                    %zi bytes\n"
 "    Part offset:                    %lu bytes\n"
-"    Part file size (used portion):  %zi bytes\n"
+"    Part file size (used portion):  %lu bytes\n"
 "\n"
 msgstr ""
 "%s:\n"
@@ -4051,12 +4047,12 @@ msgstr "--join requer um ou mais argumentos arquivo part"
 msgid "part %d is missing"
 msgstr "part %d está faltando"
 
-#: split/main.c:38
+#: split/main.c:40
 msgid "Debian GNU/Linux `dpkg-split' package split/join tool; version "
 msgstr ""
 "Ferramento de split/join de pacote Debian GNU/Linux `dpkg-split'; versão "
 
-#: split/main.c:40
+#: split/main.c:42
 msgid ""
 "Copyright (C) 1994-1996 Ian Jackson.  This is free software; see the\n"
 "GNU General Public Licence version 2 or later for copying conditions.\n"
@@ -4066,7 +4062,7 @@ msgstr ""
 "Licença Pública Geral GNU versão 2 ou superior para condições de cópia.\n"
 "NÃO existe garantia. Veja dpkg-split --licence para detalhes.\n"
 
-#: split/main.c:47
+#: split/main.c:49
 #, c-format
 msgid ""
 "Usage: dpkg-split -s|--split <file> [<prefix>]     Split an archive.\n"
@@ -4110,30 +4106,30 @@ msgstr ""
 "\n"
 "Estado de saída: 0 = OK; 1 = -a não é uma part; 2 = problema!\n"
 
-#: split/main.c:68
+#: split/main.c:70
 msgid "Type dpkg-split --help for help."
 msgstr "Digite dpkg-split --help para ajuda."
 
-#: split/main.c:78
+#: split/main.c:80
 #, c-format
 msgid "error reading %s"
 msgstr "erro lendo %s"
 
-#: split/main.c:82
+#: split/main.c:84
 #, c-format
 msgid "error reading %.250s"
 msgstr "erro lendo %.250s"
 
-#: split/main.c:83
+#: split/main.c:85
 #, c-format
 msgid "unexpected end of file in %.250s"
 msgstr "fim de arquivo não esperado em %.250s"
 
-#: split/main.c:103
+#: split/main.c:105
 msgid "part size is far too large or is not positive"
 msgstr "tamanho da part é muito grande ou não é positivo"
 
-#: split/main.c:107
+#: split/main.c:109
 #, c-format
 msgid "part size must be at least %dk (to allow for header)"
 msgstr "tamanho da part deve ser pelo menos %dk (para permitir cabeçalho)"
@@ -4309,37 +4305,37 @@ msgstr "mdfile"
 msgid "%s: unrecognized line\n"
 msgstr "%s: linha não reconhecida\n"
 
-#: utils/md5sum.c:284
+#: utils/md5sum.c:292
 #, c-format
 msgid "%s: can't open %s\n"
 msgstr "%s: não é possível abrir %s\n"
 
-#: utils/md5sum.c:288
+#: utils/md5sum.c:296
 #, c-format
 msgid "%s: error reading %s\n"
 msgstr "%s: erro lendo %s\n"
 
-#: utils/md5sum.c:294
+#: utils/md5sum.c:302
 #, c-format
 msgid "FAILED\n"
 msgstr "FALHOU\n"
 
-#: utils/md5sum.c:296
+#: utils/md5sum.c:304
 #, c-format
 msgid "%s: MD5 check failed for '%s'\n"
 msgstr "%s: checagem MD5 falhou para '%s'\n"
 
-#: utils/md5sum.c:299
+#: utils/md5sum.c:307
 #, c-format
 msgid "OK\n"
 msgstr "OK\n"
 
-#: utils/md5sum.c:303
+#: utils/md5sum.c:311
 #, c-format
 msgid "%s: %d of %d file(s) failed MD5 check\n"
 msgstr "%s: %d de %d arquivo(s) falhou/falharam a checagem MD5\n"
 
-#: utils/md5sum.c:305
+#: utils/md5sum.c:313
 #, c-format
 msgid "%s: no files checked\n"
 msgstr "%s: nenhum arquivo checado\n"
@@ -5410,9 +5406,10 @@ msgid " verbose:v help:?"
 msgstr " detalhado:v ajuda:?"
 
 #: dselect/pkginfo.cc:82
+#, fuzzy
 msgid ""
 "The line you have highlighted represents many packages; if you ask to "
-"install, remove, hold, &c it you will affect all the packages which match "
+"install, remove, hold, etc. it you will affect all the packages which match "
 "the criterion shown.\n"
 "\n"
 "If you move the highlight to a line for a particular package you will see "
@@ -5568,9 +5565,10 @@ msgid "Keystrokes"
 msgstr "Combinações de teclas"
 
 #: dselect/helpmsgs.cc:8
+#, fuzzy
 msgid ""
 "Motion keys: Next/Previous, Top/End, Up/Down, Backwards/Forwards:\n"
-"  n, Down-arrow, j      p, Up-arrow, k          move highlight\n"
+"  Down-arrow, j         Up-arrow, k             move highlight\n"
 "  N, Page-down, Space   P, Page-up, Backspace   scroll list by 1 page\n"
 "  ^n                    ^p                      scroll list by 1 line\n"
 "  t, Home               e, End                  jump to top/end of list\n"
@@ -5596,7 +5594,7 @@ msgid ""
 "   R     Revert to state before this list      ^l   redraw display\n"
 "   U     set all to sUggested state             /   search (Return to "
 "cancel)\n"
-"   D     set all to Directly requested state    \\   repeat last search\n"
+"   D     set all to Directly requested state  n, \\  repeat last search\n"
 msgstr ""
 "Teclas de movimentação: Próx./Anterior, Topo/Final, Cima/Baixo, Trás/"
 "Frente:\n"
@@ -6026,6 +6024,9 @@ msgstr ""
 "  /               procurar (enter para cancelar procura)\n"
 "  \\               repetir última busca\n"
 
+#~ msgid "must be at least two characters"
+#~ msgstr "precisa ter ao menos dois caracteres"
+
 #~ msgid "no gcc-lib component"
 #~ msgstr "nenhum componente gcc-lib"
 

po/sv.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dpkg 1.10\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-04-25 18:54+0100\n"
+"POT-Creation-Date: 2004-06-01 18:18-0300\n"
 "PO-Revision-Date: 2004-03-13 18:37+0100\n"
 "Last-Translator: Peter Karlsson <peterk@debian.org>\n"
 "Language-Team: Peter Karlsson <peterk@debian.org>\n"
@@ -57,17 +57,17 @@ msgstr "Systemfel nr %d"
 msgid "Signal no.%d"
 msgstr "Signal nr %d"
 
-#: lib/database.c:124
+#: lib/database.c:125
 #, c-format
 msgid "couldn't allocate memory for strdup in findpackage(%s)"
 msgstr "kunde inte allokera minne för strängduplicering i findpackages(%s)"
 
-#: lib/database.c:194
+#: lib/database.c:195
 #, c-format
 msgid "size %7d occurs %5d times\n"
 msgstr "storlek %7d förekommer %5d gånger\n"
 
-#: lib/database.c:195
+#: lib/database.c:196
 msgid "failed write during hashreport"
 msgstr "misslyckades med att skriva under \"hashreport\""
 
@@ -749,41 +749,37 @@ msgstr "f
 msgid "must start with an alphanumeric"
 msgstr "måste börja med ett alfanumeriskt tecken"
 
-#: lib/parsehelp.c:115
-msgid "must be at least two characters"
-msgstr "måste vara minst två tecken"
-
-#: lib/parsehelp.c:124
+#: lib/parsehelp.c:123
 #, c-format
 msgid "character `%c' not allowed - only letters, digits and %s allowed"
 msgstr "tecknet \"%c\" ej tillåtet - endast tecken, siffror och %s tillåts"
 
-#: lib/parsehelp.c:179
+#: lib/parsehelp.c:178
 msgid "<none>"
 msgstr "<ingen>"
 
-#: lib/parsehelp.c:194
+#: lib/parsehelp.c:193
 msgid "version string is empty"
 msgstr "versionssträng ej tom"
 
-#: lib/parsehelp.c:205
+#: lib/parsehelp.c:204
 msgid "version string has embedded spaces"
 msgstr "versionssträng har inbäddade mellanslag"
 
-#: lib/parsehelp.c:210
+#: lib/parsehelp.c:209
 msgid "epoch in version is not number"
 msgstr "epoch i versionen är inte ett tal"
 
-#: lib/parsehelp.c:211
+#: lib/parsehelp.c:210
 msgid "nothing after colon in version number"
 msgstr "ingenting efter kolon i versionsnumret"
 
-#: lib/parsehelp.c:233
+#: lib/parsehelp.c:232
 #, c-format
 msgid "missing %s"
 msgstr "saknat %s"
 
-#: lib/parsehelp.c:237
+#: lib/parsehelp.c:236
 #, c-format
 msgid "empty value for %s"
 msgstr "tomt värde för %s"
@@ -1479,86 +1475,86 @@ msgstr "l
 msgid "EOF on stdin at conffile prompt"
 msgstr "Filslut på stdin vid konfigurationsfilsfrågan"
 
-#: main/depcon.c:74
+#: main/depcon.c:76
 #, c-format
 msgid "unable to check for existence of `%.250s'"
 msgstr "kunde inte kontrollera om \"%.250s\" existerar"
 
-#: main/depcon.c:134 main/packages.c:386
+#: main/depcon.c:153 main/packages.c:389
 msgid " depends on "
 msgstr " beror på "
 
-#: main/depcon.c:135
+#: main/depcon.c:154
 msgid " pre-depends on "
 msgstr " beror i förväg på "
 
-#: main/depcon.c:136
+#: main/depcon.c:155
 msgid " recommends "
 msgstr " rekommenderar "
 
-#: main/depcon.c:137
+#: main/depcon.c:156
 msgid " conflicts with "
 msgstr " är i konflikt med "
 
-#: main/depcon.c:138
+#: main/depcon.c:157
 msgid " suggests "
 msgstr " föreslår "
 
-#: main/depcon.c:139
+#: main/depcon.c:158
 msgid " enhances "
 msgstr " förbättrar "
 
-#: main/depcon.c:215
+#: main/depcon.c:234
 #, c-format
 msgid "  %.250s is to be removed.\n"
 msgstr "  %.250s kommer att tas bort.\n"
 
-#: main/depcon.c:218
+#: main/depcon.c:237
 #, c-format
 msgid "  %.250s is to be deconfigured.\n"
 msgstr "  %.250s kommer att avkonfigureras.\n"
 
-#: main/depcon.c:222
+#: main/depcon.c:241
 #, c-format
 msgid "  %.250s is to be installed, but is version %.250s.\n"
 msgstr "  %.250s kommer att installeras, men är version %.250s.\n"
 
-#: main/depcon.c:230
+#: main/depcon.c:249
 #, c-format
 msgid "  %.250s is installed, but is version %.250s.\n"
 msgstr "  %.250s är installerad, men är version %.250s.\n"
 
-#: main/depcon.c:245
+#: main/depcon.c:264
 #, c-format
 msgid "  %.250s is unpacked, but has never been configured.\n"
 msgstr "  %.250s är uppackad, men har aldrig konfigurerats.\n"
 
-#: main/depcon.c:249
+#: main/depcon.c:268
 #, c-format
 msgid "  %.250s is unpacked, but is version %.250s.\n"
 msgstr "  %.250s är uppackad, men är version %.250s.\n"
 
-#: main/depcon.c:255
+#: main/depcon.c:274
 #, c-format
 msgid "  %.250s latest configured version is %.250s.\n"
 msgstr "  senast konfigurerad version av %.250s är %.250s.\n"
 
-#: main/depcon.c:264
+#: main/depcon.c:283
 #, c-format
 msgid "  %.250s is %s.\n"
 msgstr "  %.250s är %s.\n"
 
-#: main/depcon.c:300
+#: main/depcon.c:319
 #, c-format
 msgid "  %.250s provides %.250s but is to be removed.\n"
 msgstr "  %.250s tillhandahåller %.250s men kommer att tas bort.\n"
 
-#: main/depcon.c:304
+#: main/depcon.c:323
 #, c-format
 msgid "  %.250s provides %.250s but is to be deconfigured.\n"
 msgstr "  %.250s tillhandahåller %.250s men kommer att avkonfigureras.\n"
 
-#: main/depcon.c:309
+#: main/depcon.c:328
 #, c-format
 msgid "  %.250s provides %.250s but is %s.\n"
 msgstr "%.250s tillhandahåller %.250s men men är %s.\n"
@@ -1566,28 +1562,28 @@ msgstr "%.250s tillhandah
 #. If the package wasn't installed at all, and we haven't said
 #. * yet why this isn't satisfied, we should say so now.
 #.
-#: main/depcon.c:323
+#: main/depcon.c:342
 #, c-format
 msgid "  %.250s is not installed.\n"
 msgstr "  %.250s är inte installerad.\n"
 
-#: main/depcon.c:354
+#: main/depcon.c:373
 #, c-format
 msgid "  %.250s (version %.250s) is to be installed.\n"
 msgstr "  %.250s (version %.250s) kommer att installeras.\n"
 
-#: main/depcon.c:368
+#: main/depcon.c:387
 #, c-format
 msgid "  %.250s (version %.250s) is %s.\n"
 msgstr "  %.250s (version %.250s) är %s.\n"
 
 #. conflicts and provides the same
-#: main/depcon.c:393
+#: main/depcon.c:412
 #, c-format
 msgid "  %.250s provides %.250s and is to be installed.\n"
 msgstr "  %.250s tillhandahåller %.250s och kommer att installeras.\n"
 
-#: main/depcon.c:424
+#: main/depcon.c:443
 #, c-format
 msgid "  %.250s provides %.250s and is %s.\n"
 msgstr "  %.250s tillhandahåller %.250s och är %s.\n"
@@ -2104,7 +2100,7 @@ msgid " --licence for copyright and license details.\n"
 msgstr " --license för upphovsrättsliga och licenstekniska detaljer.\n"
 
 #: main/main.c:58
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "Usage: \n"
 "  dpkg -i|--install      <.deb file name> ... | -R|--recursive <dir> ...\n"
@@ -2166,11 +2162,11 @@ msgid ""
 "  --abort-after <n>              Abort after encountering <n> errors\n"
 "\n"
 "Comparison operators for --compare-versions are:\n"
-" lt le eq ne ge gt       (treat no version as earlier than any version);\n"
-" lt-nl le-nl ge-nl gt-nl (treat no version as later than any version);\n"
+" lt le eq ne ge gt       (treat empty version as earlier than any version);\n"
+" lt-nl le-nl ge-nl gt-nl (treat empty version as later than any version);\n"
 " < << <= = >= >> >       (only for compatibility with control file syntax).\n"
 "\n"
-"Use `dselect' 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"
@@ -2266,7 +2262,7 @@ msgstr ""
 "Flaggor markerade med [*] ger mycket utdata - kör genom \"less\" eller \"more"
 "\"!"
 
-#: main/main.c:185 main/query.c:506 dpkg-deb/main.c:157 split/main.c:144
+#: main/main.c:185 main/query.c:506 dpkg-deb/main.c:157 split/main.c:146
 #, c-format
 msgid "conflicting actions --%s and --%s"
 msgstr "motstridiga val --%s och --%s"
@@ -2450,7 +2446,7 @@ msgid "unexpected eof before end of line %d"
 msgstr "oväntat filslut före slut på rad %d"
 
 #: main/main.c:540 main/main.c:555 main/query.c:541 dpkg-deb/main.c:169
-#: split/main.c:157
+#: split/main.c:159
 msgid "need an action option"
 msgstr "du har inte talat om vad som skall utföras"
 
@@ -2486,43 +2482,43 @@ msgstr ""
 "Mer än en kopia av paketet %s har packats upp\n"
 " under denna körning! Konfigurerar det bara en gång.\n"
 
-#: main/packages.c:264 main/packages.c:308 main/packages.c:321
+#: main/packages.c:267 main/packages.c:311 main/packages.c:324
 msgid "  Package "
 msgstr "  Paket "
 
-#: main/packages.c:267 main/packages.c:311 main/packages.c:324
+#: main/packages.c:270 main/packages.c:314 main/packages.c:327
 msgid " which provides "
 msgstr " vilket tillhandahåller "
 
-#: main/packages.c:270
+#: main/packages.c:273
 msgid " is to be removed.\n"
 msgstr " är på väg att tas bort.\n"
 
-#: main/packages.c:282
+#: main/packages.c:285
 msgid "  Version of "
 msgstr "  Versionen av "
 
-#: main/packages.c:284
+#: main/packages.c:287
 msgid " on system is "
 msgstr " på systemet är "
 
-#: main/packages.c:304
+#: main/packages.c:307
 #, c-format
 msgid "dpkg: also configuring `%s' (required by `%s')\n"
 msgstr "dpkg: konfigurerar även \"%s\" (krävs av \"%s\")\n"
 
-#: main/packages.c:314
+#: main/packages.c:317
 msgid " is not configured yet.\n"
 msgstr " är ännu ej konfigurerat.\n"
 
-#: main/packages.c:327
+#: main/packages.c:330
 msgid " is not installed.\n"
 msgstr " är ej installerat.\n"
 
 #. Don't print the line about the package to be removed if
 #. * that's the only line.
 #.
-#: main/packages.c:392
+#: main/packages.c:395
 msgid "; however:\n"
 msgstr ", men:\n"
 
@@ -3472,10 +3468,10 @@ msgid "archive has malformatted ctrl len `%s'"
 msgstr "arkivet har felformaterad kontrollängd \"%s\""
 
 #: dpkg-deb/extract.c:193
-#, c-format
+#, fuzzy, c-format
 msgid ""
 " old debian package, version %s.\n"
-" size %ld bytes: control archive= %ld, main archive= %zi.\n"
+" size %ld bytes: control archive= %zi, main archive= %ld.\n"
 msgstr ""
 " gammalt debianpaket, version %s.\n"
 " storlek %ld byte: kontrollarkiv= %ld, huvudarkiv= %zi.\n"
@@ -3877,7 +3873,7 @@ msgid "file `%.250s' is not an archive part"
 msgstr "filen \"%.250s\" är inte en arkivdel"
 
 #: split/info.c:188
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "%s:\n"
 "    Part format version:            %s\n"
@@ -3887,9 +3883,9 @@ msgid ""
 "        ... length:                 %lu bytes\n"
 "        ... split every:            %lu bytes\n"
 "    Part number:                    %d/%d\n"
-"    Part length:                    %lu bytes\n"
+"    Part length:                    %zi bytes\n"
 "    Part offset:                    %lu bytes\n"
-"    Part file size (used portion):  %zi bytes\n"
+"    Part file size (used portion):  %lu bytes\n"
 "\n"
 msgstr ""
 "%s:\n"
@@ -3949,12 +3945,12 @@ msgstr "--join kr
 msgid "part %d is missing"
 msgstr "fel %d saknas"
 
-#: split/main.c:38
+#: split/main.c:40
 msgid "Debian GNU/Linux `dpkg-split' package split/join tool; version "
 msgstr ""
 "Debian GNU/Linux \"dpkg-split\" verktyg för delning/sammanslagning, version "
 
-#: split/main.c:40
+#: split/main.c:42
 msgid ""
 "Copyright (C) 1994-1996 Ian Jackson.  This is free software; see the\n"
 "GNU General Public Licence version 2 or later for copying conditions.\n"
@@ -3965,7 +3961,7 @@ msgstr ""
 "Se GNU General Public License version 2 eller senare för kopieringsvillkor.\n"
 "Det finns INGEN garanti. Se dpkg-split --license för detaljer.\n"
 
-#: split/main.c:47
+#: split/main.c:49
 #, c-format
 msgid ""
 "Usage: dpkg-split -s|--split <file> [<prefix>]     Split an archive.\n"
@@ -4007,30 +4003,30 @@ msgstr ""
 "\n"
 "Felstatus: 0 = OK, 1 = -a är inte en del, 2 = problem!\n"
 
-#: split/main.c:68
+#: split/main.c:70
 msgid "Type dpkg-split --help for help."
 msgstr "Skriv dpkg-split --help för hjälp."
 
-#: split/main.c:78
+#: split/main.c:80
 #, c-format
 msgid "error reading %s"
 msgstr "fel vid läsning av %s"
 
-#: split/main.c:82
+#: split/main.c:84
 #, c-format
 msgid "error reading %.250s"
 msgstr "fel vid läsning av %.250s"
 
-#: split/main.c:83
+#: split/main.c:85
 #, c-format
 msgid "unexpected end of file in %.250s"
 msgstr "oväntat filslut i %.250s"
 
-#: split/main.c:103
+#: split/main.c:105
 msgid "part size is far too large or is not positive"
 msgstr "delstorlek är för stor eller ej positiv"
 
-#: split/main.c:107
+#: split/main.c:109
 #, c-format
 msgid "part size must be at least %dk (to allow for header)"
 msgstr "delstorleken måste vara minst %dk (för att tillåta huvud)"
@@ -4204,37 +4200,37 @@ msgstr "mdfile"
 msgid "%s: unrecognized line\n"
 msgstr "%s: raden känns inte igen\n"
 
-#: utils/md5sum.c:284
+#: utils/md5sum.c:292
 #, c-format
 msgid "%s: can't open %s\n"
 msgstr "%s: kunde inte öppna %s\n"
 
-#: utils/md5sum.c:288
+#: utils/md5sum.c:296
 #, c-format
 msgid "%s: error reading %s\n"
 msgstr "%s: fel vid läsning av %s\n"
 
-#: utils/md5sum.c:294
+#: utils/md5sum.c:302
 #, c-format
 msgid "FAILED\n"
 msgstr "MISSLYCKADES\n"
 
-#: utils/md5sum.c:296
+#: utils/md5sum.c:304
 #, c-format
 msgid "%s: MD5 check failed for '%s'\n"
 msgstr "%s: MD5-kontroll misslyckades för \"%s\"\n"
 
-#: utils/md5sum.c:299
+#: utils/md5sum.c:307
 #, c-format
 msgid "OK\n"
 msgstr "OK\n"
 
-#: utils/md5sum.c:303
+#: utils/md5sum.c:311
 #, c-format
 msgid "%s: %d of %d file(s) failed MD5 check\n"
 msgstr "%s: %d av %d fil(er) misslyckades MD5-kontroll\n"
 
-#: utils/md5sum.c:305
+#: utils/md5sum.c:313
 #, c-format
 msgid "%s: no files checked\n"
 msgstr "%s: inga filer kontrollerade\n"
@@ -5303,9 +5299,10 @@ msgid " verbose:v help:?"
 msgstr " pratsam:v hjälp:?"
 
 #: dselect/pkginfo.cc:82
+#, fuzzy
 msgid ""
 "The line you have highlighted represents many packages; if you ask to "
-"install, remove, hold, &c it you will affect all the packages which match "
+"install, remove, hold, etc. it you will affect all the packages which match "
 "the criterion shown.\n"
 "\n"
 "If you move the highlight to a line for a particular package you will see "
@@ -5461,9 +5458,10 @@ msgid "Keystrokes"
 msgstr "Tangenter"
 
 #: dselect/helpmsgs.cc:8
+#, fuzzy
 msgid ""
 "Motion keys: Next/Previous, Top/End, Up/Down, Backwards/Forwards:\n"
-"  n, Down-arrow, j      p, Up-arrow, k          move highlight\n"
+"  Down-arrow, j         Up-arrow, k             move highlight\n"
 "  N, Page-down, Space   P, Page-up, Backspace   scroll list by 1 page\n"
 "  ^n                    ^p                      scroll list by 1 line\n"
 "  t, Home               e, End                  jump to top/end of list\n"
@@ -5489,7 +5487,7 @@ msgid ""
 "   R     Revert to state before this list      ^l   redraw display\n"
 "   U     set all to sUggested state             /   search (Return to "
 "cancel)\n"
-"   D     set all to Directly requested state    \\   repeat last search\n"
+"   D     set all to Directly requested state  n, \\  repeat last search\n"
 msgstr ""
 "Rörelsetangenter: Nästa/Föregående, Början/Slut, Upp/Ner, Framåt/Bakåt:\n"
 "  n, nedåtpil, j        p, uppåtpil, k          flytta markeringsrad\n"
@@ -5907,6 +5905,9 @@ msgstr ""
 "  /             sök (Enter avbryter)\n"
 "  \\             repetera senaste sökning\n"
 
+#~ msgid "must be at least two characters"
+#~ msgstr "måste vara minst två tecken"
+
 #~ msgid "no gcc-lib component"
 #~ msgstr "ingen gcc-lib-komponent"
 

scripts/Makefile.in

@@ -15,23 +15,21 @@ SBIN_SCRIPTS		= update-alternatives install-info \
 			  dpkg-divert dpkg-statoverride cleanup-info
 
 MAN1PAGES		= dpkg-name.1 dpkg-source.1 822-date.1 \
-			  dpkg-checkbuilddeps.1
+			  dpkg-checkbuilddeps.1 dpkg-scanpackages.1 \
+			  dpkg-scansources.1
 MAN8PAGES		= update-alternatives.8 install-info.8  \
-			  cleanup-info.8 dpkg-scanpackages.8 dpkg-scansources.8 \
-			  dpkg-divert.8 dpkg-statoverride.8
+			  cleanup-info.8 dpkg-divert.8 dpkg-statoverride.8
 
 CHANGELOG_PARSERS	= cl-debian
 
 SCRIPTLIBS		= controllib.pl
 
-GEN_MAN8PAGES		= dpkg-scansources.8
-
-GEN_MAN1PAGES		= dpkg-architecture.1
+GEN_MAN1PAGES		= dpkg-architecture.1 dpkg-scansources.1
 
 MAN_SOURCE_ALIASES	= dpkg-gencontrol.1 dpkg-genchanges.1 dpkg-buildpackage.1 \
 			  dpkg-distaddfile.1 dpkg-parsechangelog.1 dpkg-shlibdeps.1
 
-GENFILES		= $(CHANGELOG_PARSERS) $(BIN_SCRIPTS) $(SBIN_SCRIPTS) $(GEN_MAN1PAGES) $(GEN_MAN8PAGES)
+GENFILES		= $(CHANGELOG_PARSERS) $(BIN_SCRIPTS) $(SBIN_SCRIPTS) $(GEN_MAN1PAGES)
 
 .PHONY: all
 all:: $(GENFILES)
@@ -92,9 +90,6 @@ install-doc:
 	done
 
 
-%.8: $(srcdir)/%.pl
-	pod2man --section=8 $^ > $@
-
 %.1: $(srcdir)/%.pl
 	pod2man --section=1 $^ > $@
 

scripts/dpkg-architecture.pl

@@ -65,10 +65,12 @@ require 'controllib.pl';
 	    's390',		's390-linux',
 	    's390x',		's390x-linux',
 	    'ia64',		'ia64-linux',
-	    'amd64',            'x86_64-linux',
+	    'x86-64',           'x86_64-linux',
 	    'openbsd-i386',	'i386-openbsd',
-	    'freebsd-i386',	'i386-kfreebsd-gnu',
+	    'freebsd-i386',	'i386-freebsd',
+	    'kfreebsd-i386',	'i386-kfreebsd-gnu',
 	    'netbsd-i386',	'i386-netbsdelf-gnu',
+	    'knetbsd-i386',	'i386-knetbsd-gnu',
 	    'darwin-powerpc',	'powerpc-darwin',
 	    'darwin-i386',	'i386-darwin');
 

scripts/dpkg-scansources.pl

@@ -590,7 +590,7 @@ Print the version number and exit.
 
 =head1 SEE ALSO
 
-dpkg-scanpackages(8)
+dpkg-scanpackages(1)
 
 =head1 AUTHOR
 

scripts/dpkg-shlibdeps.pl

@@ -269,8 +269,10 @@ sub scanshlibsfile {
 if (!$stdout) {
     open(Y,"> $varlistfile.new") ||
         syserr("open new substvars file \`$varlistfile.new'");
-    chown(@fowner, "$varlistfile.new") ||
-	syserr("chown of \`$varlistfile.new'");
+    unless ($<) {
+	chown(@fowner, "$varlistfile.new") ||
+	    syserr("chown of \`$varlistfile.new'");
+    }
     if (open(X,"< $varlistfile")) {
         while (<X>) {
             s/\n$//;

scripts/dpkg-source.1

@@ -740,6 +740,12 @@ These variables each hold the corresponding character.
 Variable settings with names of this form are generated by
 .B dpkg\-shlibdeps
 - see above.
+.TP
+.B dpkg:UpstreamVersion
+The upstream version of dpkg.
+.TP
+.B dpkg:Version
+The full version of dpkg.
 .LP
 If a variable is referred to but not defined it generates a warning
 and an empty value is assumed.

split/info.c

@@ -193,9 +193,9 @@ void print_info(const struct partinfo *pi) {
          "        ... length:                 %lu bytes\n"
          "        ... split every:            %lu bytes\n"
          "    Part number:                    %d/%d\n"
-         "    Part length:                    %lu bytes\n"
+         "    Part length:                    %zi bytes\n"
          "    Part offset:                    %lu bytes\n"
-         "    Part file size (used portion):  %zi bytes\n\n"),
+         "    Part file size (used portion):  %lu bytes\n\n"),
          pi->filename,
          pi->fmtversion,
          pi->package,
@@ -207,7 +207,7 @@ void print_info(const struct partinfo *pi) {
          pi->maxpartn,
          pi->thispartlen,
          pi->thispartoffset,
-         pi->filesize);
+         (unsigned long)pi->filesize);
 }
 
 void do_info(const char *const *argv) {

split/main.c

@@ -25,6 +25,8 @@
 #include <stdlib.h>
 #include <limits.h>
 #include <assert.h>
+#include <sys/types.h>
+#include <sys/stat.h>
 
 #include <dpkg.h>
 #include <dpkg-db.h>

utils/md5sum.1

@@ -30,7 +30,7 @@ for more information.
 .TP
 .B \-b
 Use binary mode. In unix environment, only difference between this and
-the normal mode is an asterix preceding the filename in the output.
+the normal mode is an asterisk preceding the filename in the output.
 .TP
 .B \-c
 Check md5sum of all files listed in

utils/md5sum.c

@@ -256,14 +256,15 @@ get_md5_line(FILE *fp, unsigned char *digest, char *file)
 		return 0;
 
         /* Strip the trailing newline, if present */
-        if (p[i-1] == '\n')
-		if (p[i-2] == '\r')
+        if (p[i-1] == '\n') {
+		if (p[i-2] == '\r') {
 			if (i < 3)
 				return 0;
 
 			p[i-2] = '\0';
-		else
+		} else {
 			p[i-1] = '\0';
+		}
  	}
 
 	strcpy(file, p);

utils/start-stop-daemon.c

@@ -650,9 +650,10 @@ pid_is_user(pid_t pid, uid_t uid)
 		return 0;
 	return (sb.st_uid == uid);
 	pstat = proc_stat_list_pid_proc_stat (procset, pid);
-	if (pstat == NULL)
-		fatal ("Error getting process information: NULL proc_stat struct");
-	proc_stat_set_flags (pstat, PSTAT_PID | PSTAT_OWNER_UID);
+	if (pstat)
+		proc_stat_set_flags (pstat, PSTAT_PID | PSTAT_OWNER_UID);
+	else
+		return 1;
 	return (pstat->owner_uid == uid);
 }
 
@@ -661,9 +662,10 @@ pid_is_cmd(pid_t pid, const char *name)
 {
 	struct proc_stat *pstat;
 	pstat = proc_stat_list_pid_proc_stat (procset, pid);
-	if (pstat == NULL)
-		fatal ("Error getting process information: NULL proc_stat struct");
-	proc_stat_set_flags (pstat, PSTAT_PID | PSTAT_ARGS);
+	if (pstat)
+		proc_stat_set_flags (pstat, PSTAT_PID | PSTAT_ARGS);
+	else
+		return 1;
 	return (!strcmp (name, pstat->args));
 }
 #endif /* OSHURD */
@@ -751,15 +753,6 @@ do_procinit(void)
 
 
 #if defined(OSHURD)
-error_t
-check_all(void *ptr)
-{
-	struct proc_stat *pstat = ptr;
-
-	check(pstat->pid);
-	return 0;
-}
-
 static void
 do_procinit(void)
 {
@@ -779,7 +772,10 @@ do_procinit(void)
 		error(1, err, "proc_stat_list_add_all");
 
 	/* Check all pids */
-	ihash_iterate(context->procs, check_all);
+	HURD_IHASH_ITERATE (&context->procs, ptr) {
+		struct proc_stat *pstat = ptr;
+		check(pstat->pid);
+	}
 }
 #endif /* OSHURD */